summaryrefslogtreecommitdiffstats
path: root/tools/aidl
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2014-11-12 03:45:20 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-12 03:45:20 +0000
commit1c53c20c276d98e5bb37f1351063368debcf3783 (patch)
treef5aa803fdfcaf2a3887626c462c9ffbeb97edca4 /tools/aidl
parent57e0d099fbae470d6759ac1cd4e801cee14b4997 (diff)
parent358d19065b0e32ee4d48f26477cf917856e46359 (diff)
downloadframeworks_base-1c53c20c276d98e5bb37f1351063368debcf3783.zip
frameworks_base-1c53c20c276d98e5bb37f1351063368debcf3783.tar.gz
frameworks_base-1c53c20c276d98e5bb37f1351063368debcf3783.tar.bz2
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.
Diffstat (limited to 'tools/aidl')
0 files changed, 0 insertions, 0 deletions