summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2014-11-12 01:21:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-12 01:21:13 +0000
commit70532bf46433519a27ecada265b6de9364f51f39 (patch)
tree630d71128b1b24bf0df9c7790248b6ff9943cf05 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1314e9a25921e7b87fc94db46e690b07d446237d (diff)
parent5c14bc213be3e311c150b7cb86dc880937b3b7b7 (diff)
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 * commit '5c14bc213be3e311c150b7cb86dc880937b3b7b7': 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/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions