tree 332894d73e78b79a3e16c49ad2fa3394d9545b2e
parent 1e06d4c64b6549a73df9d308ae82d7080fd51f37
parent 9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1
author Adrian Roos <roosa@google.com> 1437680855 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437680855 +0000

am 9fb98375: am b30f841c: resolved conflicts for merge of c1244a29 to mnc-dr-dev

* commit '9fb98375e80e4b70fe8a5ea2e0cd0e9a6cc6f5c1':
  Touch, wake and unlock