tree 974192e5b8e4865e4e89fbc7f2f537d007376671
parent 56cb7b61ca39ae1ce155ad347e07b4b1f3fc7517
parent 2175f24ce452fc96226f97124899d01f96752f17
author Cassie Han <xih@google.com> 1521587753 +0000
committer android-build-merger <android-build-merger@google.com> 1521587753 +0000

Merge "Cherry-pick 'Update the string values for the error message while network scan'"
am: 2175f24ce4

Change-Id: I1be9bb321f23a44a42e53f0f5cb5de379dd5ff85