diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-18 01:22:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-18 01:22:21 +0000 |
commit | f02c98b997f577bd39bbcf38d1e000f9ec734c5d (patch) | |
tree | bf14da1d27293a97ac65148154c5ca896f5afe0f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6016e914c87c7b2b3f087df2c532331b88b52190 (diff) | |
parent | 9197eca562a8f9b1b221f607f426c50b8598c421 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 75706ea008 -s ours am: 5d27878551 -s ours am: 9197eca562 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15600197
Change-Id: Ib27e1012ef7a62e65150c16c443f21c0947eae63
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions