summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Paul Jensen <pauljensen@google.com> 2015-07-29 16:38:52 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-29 16:38:52 +0000
commit4c55639a780caa3e0a3594795ab408c5a8618ff2 (patch)
treeeba65393c698200b43bcff16f79d85faa1f055d7 /libs/hwui/Program.cpp
parent9314ed71a92165db3a6fccdb5e60bef887d1d27c (diff)
parent8c83be093d7d139868f1fb4ea8d4290898d5a62f (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
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions