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