OSDN Git Service

am 06eabfcc: am 4c55639a: am 8c83be09: am bf10991d: resolved conflicts for merge...
authorPaul Jensen <pauljensen@google.com>
Wed, 29 Jul 2015 17:31:12 +0000 (17:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jul 2015 17:31:12 +0000 (17:31 +0000)
commitdede231240c0a93c2ed7b4d745d148edd9ea1ca7
tree0123c8e5b2e5e6321c88c58386e73c2414cce647
parent114fb59f94aca616bdb35be2ee63ada74eb87e31
parent06eabfcc2d82833ec89bf92d087210bab18d78bb
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