tree 8659f6e5dcf24defc89ebfaba487422db21e330a
parent 452795647406bfac2ce7d2671a3158a5be20e0b4
parent da2e11e7e8ba2cc022c9c74e659ada9f1f27382e
author Samuel Tan <samueltan@google.com> 1467853263 +0000
committer android-build-merger <android-build-merger@google.com> 1467853263 +0000

Merge \"[DO NOT MERGE] WifiConfigManager: do not use ScanDetailCache to set SSID for... passpoint networks\" into nyc-mr1-dev
am: da2e11e7e8

Change-Id: I949bd1cf66a0af39dd54c1d9ad168729f041ff94