diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:38:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:38:56 +0000 |
| commit | a0d5e03b0ec2703fce8f3782e0a0757616ec305b (patch) | |
| tree | 4097f89531eabc47b5c03d1403efe35e6c50dd7a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 41fd845d6ecaa36d7c0662a7ca07a70af8e8e778 (diff) | |
| parent | 40c4b483e2a9ecccb2ea548e5af824b9cadccbbf (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: bf3bab9dea -s ours am: 40c4b483e2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: I885f8fc1ce945df75c4bb64b5bf05e96255d555e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions