diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:16:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:16:24 +0000 |
| commit | 523566ba773d35be992592c9a8cd72e0c3d5f6d3 (patch) | |
| tree | fc91e7857ff363c36aae53f9c86376614cfe3c9a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b73462bf64006033635f2e2f1b16fac81237ce2b (diff) | |
| parent | 79ac7f0534a053dbf1e5bf4a37efaf5d1bebfc09 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1d3930448f -s ours am: 79ac7f0534 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13168483
Change-Id: I09b196be1f9495212dc4f2fd8a48e0f44c423415
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions