summaryrefslogtreecommitdiff
path: root/libs/hwui/Program.cpp
diff options
context:
space:
mode:
author Paul Jensen <pauljensen@google.com> 2015-07-29 16:13:05 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-29 16:13:05 +0000
commit8c83be093d7d139868f1fb4ea8d4290898d5a62f (patch)
tree3fd383f3a4d914c8dfde1c9edb447fe18e7c915e /libs/hwui/Program.cpp
parent4ad686f10ea2c7e0dc4d92cced4aeed97a3e0416 (diff)
parentbf10991d76ce6674726a668939be300cae150130 (diff)
am bf10991d: resolved conflicts for merge of 30813942 to mnc-dr-dev
* commit 'bf10991d76ce6674726a668939be300cae150130': Disable WiFi autojoin when user decides via "Stay connected?" dialog
Diffstat (limited to 'libs/hwui/Program.cpp')
0 files changed, 0 insertions, 0 deletions