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