tree a4f2588b11b11714d353f6b8bc70d8c756754f09
parent ca58b8434ce845396f47449cc5a9b17349384960
parent 2119fd034ce1435108b79bb121ea901399c39b66
author Cassie Han <xih@google.com> 1521595330 +0000
committer android-build-merger <android-build-merger@google.com> 1521595330 +0000

Merge "Cherry-pick 'Update the string values for the error message while network scan'" am: 2175f24ce4 am: 2ee6f7b95f  -s ours
am: 2119fd034c  -s ours

Change-Id: Ib6d7f89a2c20ac4bf942552e760b30099f4edbbc