tree b719c91734b64d830a80c2087e9ce34a2f59b6c1
parent 87fc05b85d501a8221f4a3a0c97534b3160acb35
parent 7f37402d8c5667f72c1ef02a20112d49d7a149b8
author Nick Armstrong-Crews <strongarm@google.com> 1441391723 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441391723 +0000

am 7f37402d: am 43c4459d: am 6f0ba402: Merge "Handle KEYCODE_SOFT_SLEEP from Ungaze." into cw-e-dev

* commit '7f37402d8c5667f72c1ef02a20112d49d7a149b8':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.