OSDN Git Service

Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am:...
authorSundeep Ghuman <sghuman@google.com>
Thu, 15 Jun 2017 06:53:40 +0000 (06:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 15 Jun 2017 06:53:40 +0000 (06:53 +0000)
commit08f1523ac7b7dec0a161aac8bd401ff2011ebd2c
tree0d5e3ca47cfa6f9b3cebb1f335f700f43059c8b1
parentbb29b8dc19c9532b66b28773ec67d1b94b88e865
parentbb71287d3c9d1024a23ed83a9aa983985d5e68ad
Merge "Merge "Allow WifiSettings to show old APs on app resume." into oc-dev am: 683a7e2bf5  -s ours am: ea46967c2e  -s ours" into oc-dr1-dev-plus-aosp
am: bb71287d3c  -s ours

Change-Id: Ie95eb695e4e8453d5b0bd3785de0c0668e394149