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