diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-05 15:58:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 15:58:51 +0000 |
| commit | e6e5c08f3fee0e71fbdf473769591e0bf185c862 (patch) | |
| tree | e29a0426f2696ef3bbde57060daa0e1cef195d31 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 22147f938951c8d6fdee9f0e1a3e2ccce3f4ab5b (diff) | |
| parent | fd9c90f4dcdcf6bdf1119825ced6de0ee5e463d4 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a3d1d70981 -s ours am: 523d30f631 -s ours am: e1c57f6a0e -s ours am: fd9c90f4dc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12762769
Change-Id: I61734f52588132d3702d553d88f1cfb592638414
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions