diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 18:51:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 18:51:33 +0000 |
| commit | e159b9d964d178c2b0f157747e9483ce1c26f602 (patch) | |
| tree | fd1fb1f2780ac4af30d9df76545b5fcac4804b36 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 57805e14b83d342ebe31739b4df2655c95aaea44 (diff) | |
| parent | 8ec76482fac9655ecc43f1e2ec45d52c28841655 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c0d744e6a1 -s ours am: 8ec76482fa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14171945
Change-Id: Ia219d1dd512057a3c1595a850ad0bab928131ea0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions