OSDN Git Service

am 7afdf7f0: am 2445880c: am ba8a5413: Fix missing lock in power manager.
authorJeff Brown <jeffbrown@google.com>
Fri, 19 Jul 2013 20:42:27 +0000 (13:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Jul 2013 20:42:27 +0000 (13:42 -0700)
* commit '7afdf7f0514bebe1188e0c1bc60e76f853065e82':
  Fix missing lock in power manager.


Trivial merge