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