summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAnthony Hugh <ahugh@google.com>2016-07-12 20:49:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-12 20:49:37 +0000
commitdd476c8e575e86ae0dc4ebc5cad847d5118e0101 (patch)
treeae565fdfefdb366919091ddcf5ac28da3c8243bc /tools/aapt2/java/JavaClassGenerator.cpp
parent894dd710b124279d5cb86d7f4b5750264398f1a1 (diff)
parent1b7c5631c4e572f911e996f1f928de5adebfd47a (diff)
Merge \"Prevent back button from being handled by app after waking device\" into nyc-mr1-dev
am: 1b7c5631c4 Change-Id: I0a0dae375e9528040483e4471d3093679a94533c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions