tree 165574b9db451bc65b5ac3941731e9064b9de4f7
parent a62fbd31b38d95817ebd65118e4c7ef2d82bc2ee
parent 11184922d30f468bf97a2e20a3aeff7e1ae7ca54
author John Spurlock <jspurlock@google.com> 1368225544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1368225544 -0700

am 11184922: Merge "Fix battery level quick settings tile bug." into jb-mr2-dev

* commit '11184922d30f468bf97a2e20a3aeff7e1ae7ca54':
  Fix battery level quick settings tile bug.