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