diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-10 21:36:46 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-10 21:36:46 +0000 |
commit | 2912b7cebc04eeb5c60e5f0f28c950c7208d991a (patch) | |
tree | 938a593a5af42c4e0d8aa75966ad57863142f149 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b41b94e9ccfb3d2bc3acf76c80ad3d744b3037a5 (diff) | |
parent | b09daed99c49189c896d6dc5b79e69582de49877 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: b09daed99c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14149621
Change-Id: I92a16e40d13cd3d4a6595b3ab32069962ff78f57
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions