Merge "Enhanced network scan request"
authorSooraj Sasindran <sasindran@google.com>
Tue, 17 Oct 2017 06:11:13 +0000 (06:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Oct 2017 06:11:13 +0000 (06:11 +0000)
am: 8e5f008ae6

Change-Id: I8903402f50c64b475ccda3839f0175fb2eaa12f6


Trivial merge