OSDN Git Service

Merge "Make Bluetooth encryption aware am: cf48e13e3b am: 37850ce258" into nyc-mr1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 3 May 2016 00:53:17 +0000 (00:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 3 May 2016 00:53:17 +0000 (00:53 +0000)
commit003cd995901b2047c12c4a6364c7db08c0c02479
tree237752682b3a4a13fde986536d47e7be3ed42c2a
parenta636a03d7b5b51ec4f15607c23760b0bbd7ef1a9
parent71ad25711eaa12d0462f04e863154c41e8845861
Merge "Make Bluetooth encryption aware am: cf48e13e3b am: 37850ce258" into nyc-mr1-dev-plus-aosp