tree d0a9b0e34e21c6a798b1a78f913a69e211e8244c
parent ec463b96e188f2c68cbef2362e570118a3a460ed
parent 2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e
author Jeff Brown <jeffbrown@google.com> 1394614671 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394614671 +0000

am 2d8a3908: Fix power manager display wake lock bugs.

* commit '2d8a3908d2b0a74ccdecd97e86e7bfda1caa218e':
  Fix power manager display wake lock bugs.