Merge " Add VTS code for the network scan API"
authoryinxu <yinxu@google.com>
Mon, 24 Jul 2017 23:50:57 +0000 (23:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 24 Jul 2017 23:50:57 +0000 (23:50 +0000)
am: 6ef70c9040

Change-Id: I53e0827adf81cfde229f2f1d202ba5e589b7b4e3


Trivial merge