OSDN Git Service

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

Change-Id: I4546ba9002e305fe56582ca76a94c25a2cbe97a1


Trivial merge