diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:52:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:52:04 +0000 |
| commit | aa63d8df26ca11dd8707162025136949e29a2c5e (patch) | |
| tree | cade9d6f17d984a1d175b8c1e74e2a13f8aa2df7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 96617a3edc119a8470e84a4a47317a6cba3679d9 (diff) | |
| parent | a0d5e03b0ec2703fce8f3782e0a0757616ec305b (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: a0d5e03b0e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: I4075471225b8f8233123e4c6a0cced27d5e8ddd3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions