| commit | 4c55639a780caa3e0a3594795ab408c5a8618ff2 | [log] [tgz] |
|---|---|---|
| author | Paul Jensen <pauljensen@google.com> | Wed Jul 29 16:38:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 29 16:38:52 2015 +0000 |
| tree | eba65393c698200b43bcff16f79d85faa1f055d7 | |
| parent | 9314ed71a92165db3a6fccdb5e60bef887d1d27c [diff] | |
| parent | 8c83be093d7d139868f1fb4ea8d4290898d5a62f [diff] |
am 8c83be09: am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev * commit '8c83be093d7d139868f1fb4ea8d4290898d5a62f': Disable WiFi autojoin when user decides via "Stay connected?" dialog