summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-03-09 15:04:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-03-09 15:04:52 +0000
commitff865f4fe58720af01deef6431330f7c65c81067 (patch)
tree47f3be08aae34e29635486b5705f616608090f3b /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1b9ff08be9251ff459cae02fdc7cac25b4e43b9d (diff)
parent9b47328666b57a59f07afc2c13a10e39af5b5529 (diff)
Merge "[automerger skipped] Merge "Rename PREFERRED_DATA_SUBID_CHANGE to ACTIVE_DATA_SUB_CHANGE" am: 016409b3d5 am: 26891a4429 am: 4d2eceffab -s ours am skip reason: change_id Icb90b5bd93845c29157cafddcd53335728638ec2 with SHA1 026451d9fb is in history"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions