summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-09-12 21:27:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-12 21:27:58 +0000
commitae559dd8aa984413179c3c0de04d49c858f31b0a (patch)
tree05d4f7940b68eff83a0f4bc05ac3c24fb97bbea5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentfbdcd968c1909b2a9ca88ec3cc0e52882a088e8d (diff)
parentceb61d373ada41e9784f0b25e9ce81783e14fee7 (diff)
Merge "Merge "DO NOT MERGE. Listen to ACTION_UID_REMOVED only." am: 1bb0616c56 -s ours am: 04829c4ddd -s ours am: 603a2174e5" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions