summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLinus Tufvesson <lus@google.com>2020-04-02 14:10:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-04-02 14:10:35 +0000
commit904021d71fe1a30d652ac601218bd1bf50c08cf4 (patch)
tree66db399f9baa591e62ce4eeeb422784035e050ee /tools/aapt2/java/JavaClassGenerator_test.cpp
parent91500f3e9db0d8fe4d574185801b8ab3f8e3d454 (diff)
parentb6cde4b8e3a3d96d1f70e53af13b38fbc1ceca9f (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE" into pi-dev am: 0b23243935 -s ours am: 03d66b4241 am: b6cde4b8e3 -s ours
am skip reason: subject contains skip directive Change-Id: I43ecc5a1a0f002ac9c3407e07a8cbfac5a414754
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions