tree 7d8effec5b71b5b9e58c01a898d670f4b5b4b35b
parent 1fb5edd78395f68b3fcda3966ebf5330ccbe19c4
parent d70377b537450d03d5cdc2efb15977d48e5cfebd
author Nick Armstrong-Crews <strongarm@google.com> 1441687710 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441687710 +0000

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

* commit 'd70377b537450d03d5cdc2efb15977d48e5cfebd':
  Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."