diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-07 19:45:50 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-07 19:45:50 +0000 |
commit | 9ff4d2e24b758733d9ce058db01fbb1d0cfab429 (patch) | |
tree | e43303584f0419ab63ecf53e929f86611df0f952 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4d0dd340b0de869cee4b0465f81c39b3bdca0e28 (diff) | |
parent | 91014417fc7201ee624eca800f70e53f05171ac5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9b886a538e -s ours am: 91014417fc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15480968
Change-Id: Iaa500cfbc542ca93ec890f9802663e40c1883510
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions