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