summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 03:31:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-01 03:31:50 +0000
commit7d2e901b9df0d5f2fa7d34abf58ad478655594ef (patch)
tree3405afe5c11f554f0e70864e5b5c8794f435901a /tools/aapt2/java/JavaClassGenerator.cpp
parentcc1418a1e036d3ddfd83d07a9b26ebbf27ca964f (diff)
parent0a9cf80e44c7732c1a93267fb7c2d48cb742bf32 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 0a9cf80e44 -s ours
am skip reason: subject contains skip directive Change-Id: Ic4c6e67b5f39f2c226f264b2c8f9cbb4c9df46ef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions