summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 20:24:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 20:24:38 +0000
commit2b0a36a65c78459e69e106b5678d1420e9993468 (patch)
tree2318041f4cfe3bd5f18a19c1d35b69d42da57a69 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent79fe67570350cb17736f5c416a7ba5ac64d32e78 (diff)
parent7b6b19b4ab5a9790d79afecef6a52dbbe9551b8d (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 54580f8419 -s ours am: 7b6b19b4ab -s ours
am skip reason: subject contains skip directive Change-Id: I8254d071d71afcf1bb367b69f69efc5fd108b36c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions