tree c2fb32aeaef7ab7c06e7d35b4918cc63320d4f8b
parent 71395ee8efaddaf2c279e88bd6d22acba8f1f769
parent c1244a2995087c930842b7d5e5a35a446c5c40f7
author Jorim Jaggi <jjaggi@google.com> 1437596215 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437596215 +0000

am c1244a29: Merge "Touch, wake and unlock" into mnc-dev

* commit 'c1244a2995087c930842b7d5e5a35a446c5c40f7':
  Touch, wake and unlock