tree 4571e2d1cb446ad3958143eee6a769c6a4899366
parent f5958497d36ac64ed1f2bbbd80cb0a3a24e94f13
parent 2bccc45cec5201c5b613134ebb0b398bc45483ef
author Joe LaPenna <jlapenna@google.com> 1453943556 +0000
committer android-build-merger <android-build-merger@google.com> 1453943556 +0000

[DO NOT MERGE ANYWHERE]: Allow button events in ambient. am: 7528f57c4d  -s ours
am: 2bccc45cec  -s ours

* commit '2bccc45cec5201c5b613134ebb0b398bc45483ef':
  [DO NOT MERGE ANYWHERE]: Allow button events in ambient.