OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e61accb e3318ad)
am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE...
authorWei Wang <weiwa@google.com>
Sat, 8 Mar 2014 02:18:50 +0000 (02:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Mar 2014 02:18:50 +0000 (02:18 +0000)
* commit 'e3318addc9c42a7b6d9d1ba8eaff786236b6dec0':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help