summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2019-10-10 21:33:45 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-10-10 21:33:45 -0700
commit6eba6795745b8107658ccf26f90e833973268dcc (patch)
treec5c87234ba2b2adeca6847855068467086431b14 /tools/aapt2/java/JavaClassGenerator_test.cpp
parente05f762b42ac2d61f5005de524366b25222e3f96 (diff)
parentb0136164669a404730e8cfa9c968e142d9a63fb3 (diff)
[automerger skipped] DO NOT MERGE - Merge QP1A.191005.007 into master am: 8efb8c35f1 -s ours am: 173be4a747 -s ours
am: b013616466 -s ours am skip reason: change_id Ifc7254ab3a5272b056cbc75233aa2dfa8219ea84 with SHA1 b9ad9a68fb is in history Change-Id: Ic637979da6d3e3998f7b0febb231ef0e159d57c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions