diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 13:57:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 13:57:45 +0000 |
| commit | b30a1434b98469fd0cf12d9dd5a1980ed329e078 (patch) | |
| tree | 390faf13c967870400726ca40f68bd4fce327814 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5bc71ea527ebb85ab27038836360a5f9a9827d51 (diff) | |
| parent | 0f192f44d7de988454fb03a2e5dbc5d7067d599c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086504
Change-Id: I4301c66a889eb74424d92f4d21ef439cb6f92ec8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions