diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:16:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:16:09 +0000 |
| commit | 40c4b483e2a9ecccb2ea548e5af824b9cadccbbf (patch) | |
| tree | e3287bab2a41f0733a0f9517c481001a18acba78 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bfc7c35e884e52e5a64e9aa37f4fd497e2ced301 (diff) | |
| parent | bf3bab9dea0ec580564ff9474004a3ec745abc19 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: I7f17077fad912eaf02fad85a886fefb7bde02735
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions