summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Wang <weiwa@google.com>2014-03-08 02:18:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-08 02:18:50 +0000
commitc9d49ff0f19e88fb50f048be8f308f63bc2f5d2a (patch)
tree635bb233b6112771b3a78d2f595e3bc1b5b52182
parente61accbeb0147d87deaff4d0c70e3a00cef259f2 (diff)
parente3318addc9c42a7b6d9d1ba8eaff786236b6dec0 (diff)
downloadframeworks_base-c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a.zip
frameworks_base-c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a.tar.gz
frameworks_base-c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a.tar.bz2
am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev
* commit 'e3318addc9c42a7b6d9d1ba8eaff786236b6dec0': DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
0 files changed, 0 insertions, 0 deletions