Commits
Jeff Brown authored and Android Git Automerger committed f0e2988f873M
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)
Showing diff to6395c6a4909