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