tree b8d7890bf2ff2610cccc8b0c85c0d10ec0d04f8a
parent f3d94810f1446e051743e001f931099014beefd1
parent c4df6668bbe2c723cf4eafa4cd8dafe13303e7d7
author David Su <dysu@google.com> 1574366290 -0800
committer android-build-merger <android-build-merger@google.com> 1574366290 -0800

Merge "NetworkKey: migrate from ScanResult.wifiSsid to SSID" am: 1124e240c0
am: c4df6668bb

Change-Id: I6e50821d3fdd5e6ff5fc4cd238ccd186dd1ff94c