diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-05-11 14:39:39 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-11 14:39:39 +0000 |
commit | 50d6c5237b90ef15311a507181dd2bf69dd2724a (patch) | |
tree | 60a3432b93e693b3c2d804c976760d7ca006d481 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a2b37706b5d5c7fe222b206b10e5bd9bcf5f4b14 (diff) | |
parent | a808f08c5f9820838460867141b307269e102b2c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: a808f08c5f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14494034
Change-Id: I1cccd9ab416c208d7da2b573aead5ec2c4d691f6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions