tree 85166808b2f2ce4598807277e2c961e32bcca0e0
parent 953c6a4a53715bd7e88dad78814110709bf7bf7f
parent 9b8f82a3a073891965a962251f9e613ba8cc90bb
author Nick Armstrong-Crews <strongarm@google.com> 1441686936 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441686936 +0000

am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev

* commit '9b8f82a3a073891965a962251f9e613ba8cc90bb':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."