diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-15 06:18:32 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 06:18:32 +0000 |
commit | a5ac12d5e712d87389412c63362a651e21a7c2e1 (patch) | |
tree | 7434ac5d3a5a568e57c18dcf3ae8cfb19dac611e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ab96cd06433d014536c92523f67543e8e64dad42 (diff) | |
parent | a337f6932ce69ea2a4e0c11637e7e4affbba999f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 316f0d3604 -s ours am: a337f6932c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859966
Change-Id: Ic30ead0299ddc7fa7921669c3c613ebe85e76440
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions