tree 4f4b67e69aa351f5377adfc31c56c98291ae970f
parent 578151c673bf59e4bccd2237032f720705b4dff2
parent 6f0ba402242cb8fd374f5b188e53669ec0cf34c7
author Nick Armstrong-Crews <strongarm@google.com> 1441390304 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441390304 +0000

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

* commit '6f0ba402242cb8fd374f5b188e53669ec0cf34c7':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.