Commits
Jeff Brown authored and Android Git Automerger committed d8b170799f1M
am 6ae4d53b: resolved conflicts for merge of db3146c0 to klp-modular-dev * commit '6ae4d53b571cb71cc6c2ad55d12679d22e9334d5': Fix power manager display wake lock bugs. (DO NOT MERGE)
Showing diff to6ae4d53b571