diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-01-27 05:56:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-27 05:56:12 +0000 |
commit | 5f7e78f6745a31a5deac2d3dc8ffdf9010b268ae (patch) | |
tree | 6aab63a5654d6c1180fedd837f99a6e6e172af80 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | df1768460cd198e751b2e70b83431f15143545ce (diff) | |
parent | 8157eb692a9f6661098a6fcae856acd9be1180c6 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: Ic5b9ae66911048f24597f5ddd2598674d7bd2259
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions