diff options
author | Wei Wang <weiwa@google.com> | 2014-03-08 11:02:13 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-08 11:02:13 +0000 |
commit | 76ca5655095f66bd34201df742ff22336dcf08bd (patch) | |
tree | af90bd5354f2bd901d9dc7d233cbaed6e77b4d7d /framework/java/android/bluetooth/BluetoothMap.java | |
parent | 3fc32ae702b54f2df97aa10d57c0ad45e884b257 (diff) | |
parent | cb41f8894094e7d8e06845b3c891bfca1bcc7af9 (diff) |
am c9d49ff0: (-s ours) am e3318add: am cb41f889: am b508e854: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit 'c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a':
DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothMap.java')
0 files changed, 0 insertions, 0 deletions