diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-12 18:05:49 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-12 18:05:49 +0000 |
commit | f2766486186ac426c84e9ba46c22f43f92d4427c (patch) | |
tree | 6dd522bcc76ce32f26a57bc791650e9ae5ce75b3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | fa1d89580f2224d88f8177ff8e96ad3a1fad75cc (diff) | |
parent | f3c6f975feec1faef156533d2f7a25f9d7cc843d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: b8151fc862 -s ours am: f3c6f975fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15259833
Change-Id: I9944a048f8f30a6088f50951438b5ffdd849f5b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions