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