Commits
Adrian Roos authored and Android Git Automerger committed e674e9500c7M
am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev * commit '9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1': Touch, wake and unlock
Showing diff to9fb98375e80