tree 8ad4b5d3e859465c30a6d3f932f33f865a42676b
parent 0bf53b162a2cdf8216a04f2c49bd045caf650708
parent 5f72d153aa24599940a7888d314e1ed7d53ce4b7
author Ningyuan Wang <nywang@google.com> 1479342126 +0000
committer android-build-merger <android-build-merger@google.com> 1479342126 +0000

Merge "Add security capabilities enums to ScanResult" am: a3c0324824 am: 6e67bb87cf am: 7cad272109
am: 5f72d153aa

Change-Id: Idf96f8abaed98608d8252484e9eba86d669ac7d4