tree bdc935fe2760606740872be61684e6b708a2d4cd
parent a80d36218a5cb3ef876d73a2e5294a1279e456e4
parent 43c4459d995ce7a723d92945a7e4ccb81d48e224
author Nick Armstrong-Crews <strongarm@google.com> 1441390974 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441390974 +0000

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

* commit '43c4459d995ce7a723d92945a7e4ccb81d48e224':
  Handle KEYCODE_SOFT_SLEEP from Ungaze.