| commit | f0e2988f873108ef4f03da9b6f8f5aef919ad329 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Fri Mar 14 06:11:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 06:11:02 2014 +0000 |
| tree | 2d2ad4f5b9a32f4fa603c06c4054db7139043760 | |
| parent | 6395c6a4909749d54679be16411783ccaeba4372 [diff] | |
| parent | d8b170799f1cb00825a4a947901d4b214d20c5a1 [diff] |
am d8b17079: am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev * commit 'd8b170799f1cb00825a4a947901d4b214d20c5a1': Fix power manager display wake lock bugs. (DO NOT MERGE)