am a064fa39: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a064fa39ff593f97b084b3fdc723110bd39e4ee9':
  Fix regression in Bluetooth settings.
  Addressing issue where power control widget disappears issue 7205586
This commit is contained in:
The Android Open Source Project
2012-09-26 10:07:52 -07:00
committed by Android Git Automerger

Diff Content Not Available