OSDN Git Service

Merge "Add bool field |associated| to ScanResult class" am: 12bfcf9bb3 am: ad0f6f4be6...
authorNingyuan Wang <nywang@google.com>
Tue, 20 Sep 2016 22:54:06 +0000 (22:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 22:54:06 +0000 (22:54 +0000)
am: 7dbcbacdea

Change-Id: I0765c4b2279e4158b90631c8762d87b14b41aca7


Trivial merge