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:38:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-11 20:38:33 +0000
commitb572d8b71f53ced4dd8f9671b0ee4287846947df (patch)
tree6de2bd287377b85f9b835ff38129b0ce4106f177 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentdd57568ac769851e09eeb5046539d3f2cb7924cf (diff)
parent2792895cd51b2c86689bd12aca7062b0f323f160 (diff)
[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 1720a48cb3 -s ours am: 87a94d9556 -s ours am: 2792895cd5 -s ours
am skip reason: subject contains skip directive Change-Id: I095831080d118caeefc894b54cd5e750432627e9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions