OSDN Git Service

Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5
authorSundeep Ghuman <sghuman@google.com>
Thu, 15 Jun 2017 06:45:20 +0000 (06:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 06:45:20 +0000 (06:45 +0000)
am: 0c02e22c99  -s ours

Change-Id: Iea1015089c955056d319f5365c1fb8d07e7acb93


Trivial merge