OSDN Git Service

am a84b4453: am f0e2988f: am d8b17079: am 6ae4d53b: resolved conflicts for merge...
authorJeff Brown <jeffbrown@google.com>
Fri, 14 Mar 2014 17:50:25 +0000 (10:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 Mar 2014 17:50:25 +0000 (10:50 -0700)
commit75f9cc503c5eecce28934a5fc4d00b93ba6af73d
tree326b150007d7dfeadf5ec3091338821d8a5c9402
parent8025249e86831347362f38f86669b877e6fd8a14
parenta84b44530606fdd9ee25c90f954fa1039096df89
am a84b4453: am f0e2988f: am d8b17079: am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev

* commit 'a84b44530606fdd9ee25c90f954fa1039096df89':
  Fix power manager display wake lock bugs.  (DO NOT MERGE)