tree 1e482e554bda963d9a2241697f90ae42ca6768c0
parent 3932993f0062937aa2cb9de0d67bf18b46b83efc
parent 90edca997b9e594a68fc10ede0334d29873cbf22
author Amit Mahajan <amitmahajan@google.com> 1535501547 -0700
committer android-build-merger <android-build-merger@google.com> 1535501547 -0700

[automerger skipped] Merge "Allow REQUEST_NOT_SUPPORTED as an error for startNetworkScan" into pie-vts-dev am: 00cdcb77f8  -s ours
am: 90edca997b  -s ours

Change-Id: I6220e4895af1edae293fbb118f1dffe2e88488fc