OSDN Git Service

Merge "Add capability field to wificond scan result"
authorNingyuan Wang <nywang@google.com>
Fri, 9 Sep 2016 00:20:15 +0000 (00:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 9 Sep 2016 00:20:15 +0000 (00:20 +0000)
am: 5811a5ac46

Change-Id: Ie7b537ee9a22cc98c8aecbf2857abe804c174f45


Trivial merge