Bryce Lee 358d19065b Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2 ...

automerge: 70532bf

* commit '70532bf46433519a27ecada265b6de9364f51f39':
  Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.

2014-11-12 03:19:50 +00:00

..

src/com/android/internal/policy/impl

Merge "Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running." into lmp-sprout-dev automerge: 68f9773 automerge: 5c14bc2

2014-11-12 03:19:50 +00:00

Android.mk

…