diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:38:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:38:06 +0000 |
| commit | 4741c3056c760cd808f4a86ba4c30d35d8e8be07 (patch) | |
| tree | 17001935bca7251e44159fd6b39504447028f253 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 28be1d69b8d938bf4c836643c4f41321e1f37c87 (diff) | |
| parent | d13cc53aab0f6a1685ee77b9c114bc1f4c6d957b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours am: 26c928e7f5 -s ours am: d13cc53aab -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186
Change-Id: I9f103173f806d4e1a31c8174656f0f3b0132665f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions