tree 92f9e88589d6a8b94d6347e9e9d2d85e927ae1eb
parent 5daa08df5e6a70b40aef210ec5b2bcfa897aaef6
parent d672b241f6720201e3b8f613363d71e4291b8597
author Craig Mautner <cmautner@google.com> 1338661567 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338661567 -0700

am d672b241: Merge "Fix power manager issues." into jb-dev

* commit 'd672b241f6720201e3b8f613363d71e4291b8597':
  Fix power manager issues.