OSDN Git Service

Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf
authorNingyuan Wang <nywang@google.com>
Thu, 17 Nov 2016 00:08:51 +0000 (00:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 17 Nov 2016 00:08:51 +0000 (00:08 +0000)
commit5f72d153aa24599940a7888d314e1ed7d53ce4b7
tree528771e9e0ce93afc5f73bb5732b375255d2c83c
parent643a85b09e2cf913347fa619ec7d727565b521f8
parent7cad272109afe1fa2f51f59c7083931070ae6883
Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf
am: 7cad272109

Change-Id: I2767e6465c125dd19e07af5d20ae4c23b3c8d1b1