tree 093c51b46277b30b8fab607037e89a622de85ff8
parent 1305bf7dc2b8a8797a21ed6c0fc6d517a8798dba
parent 7afdf7f0514bebe1188e0c1bc60e76f853065e82
author Jeff Brown <jeffbrown@google.com> 1374266547 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374266547 -0700

am 7afdf7f0: am 2445880c: am ba8a5413: Fix missing lock in power manager.

* commit '7afdf7f0514bebe1188e0c1bc60e76f853065e82':
  Fix missing lock in power manager.