summaryrefslogtreecommitdiff
path: root/include/androidfw/PowerManager.h
diff options
context:
space:
mode:
author David Christie <dnchrist@google.com> 2013-08-12 18:47:21 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-08-12 18:47:21 -0700
commit8810a0c3c242ab0ac252261d7f73258769cc9f2d (patch)
tree12536bb64680f9da02def74e44f07462a63fef80 /include/androidfw/PowerManager.h
parentc319ddd9ec9c630840a11765a4630b1375fe9664 (diff)
parent69b9eff155254f1c274b8adbbf5501ddec4da089 (diff)
am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers." into
* commit '69b9eff155254f1c274b8adbbf5501ddec4da089': Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers.
Diffstat (limited to 'include/androidfw/PowerManager.h')
0 files changed, 0 insertions, 0 deletions