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)

Trivial merge