commit 8b0c6c22a296d50ee120148a9e6d4b586f454f23
author David Christie <dnchrist@google.com> Fri Sep 06 12:58:14 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 06 12:58:14 2013 -0700
tree c56cdc720233cf5006d858c8593283316cfae465
parent 9b824560726eab653a1044eecdb0bfe5ff804865
parent ba957652bf7aa32cf09de6a5a05a3acfc8912824

am ba957652: Merge "Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI." into klp

* commit 'ba957652bf7aa32cf09de6a5a05a3acfc8912824':
  Fix QuickSettings to honor location setting for restricted users (b/10553306). Generally when a user is location restricted, location will be off. But just in case location is on and locked in that state, we should respect that in the UI.