| commit | 1c53c20c276d98e5bb37f1351063368debcf3783 | [log] [tgz] |
|---|---|---|
| author | Bryce Lee <brycelee@google.com> | Wed Nov 12 03:45:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 12 03:45:20 2014 +0000 |
| tree | f5aa803fdfcaf2a3887626c462c9ffbeb97edca4 | |
| parent | 57e0d099fbae470d6759ac1cd4e801cee14b4997 [diff] | |
| parent | 358d19065b0e32ee4d48f26477cf917856e46359 [diff] |
am 358d1906: 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 '358d19065b0e32ee4d48f26477cf917856e46359': Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running.