Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5
-s ours
am: ea46967c2e
-s ours
Change-Id: I12005bef18a23f1aad2c1b5b9ee7982206426a5f
This commit is contained in: