OSDN Git Service

Merge "Fix wificiond scanner integration test"
authorNingyuan Wang <nywang@google.com>
Tue, 28 Feb 2017 20:54:23 +0000 (20:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 28 Feb 2017 20:54:23 +0000 (20:54 +0000)
am: 4cdf87972f

Change-Id: I4efaff07d22ac02f197e7778429d10af874a975a


Trivial merge