OSDN Git Service

am b74fe9e2: (-s ours) DO NOT MERGE LE: Add service UUIDs and data to advertising...
authorAndre Eisenbach <andre@broadcom.com>
Sat, 8 Mar 2014 02:07:29 +0000 (02:07 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Mar 2014 02:07:29 +0000 (02:07 +0000)
* commit 'b74fe9e2c9fc0939f5c18282c985622f20b78d2a':
  DO NOT MERGE LE: Add service UUIDs and data to advertising data


Trivial merge