diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:28:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:28:38 +0000 |
| commit | 65cc1e53f9e24b327294e0108d41e0edbda349bb (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1e7fbc3a01d08aaef6b9ca958f6a59672cc2e4e1 (diff) | |
| parent | 4db5b70bc1f4cd4e2d97b1df587d36c2bec84691 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dc862269a7 -s ours am: 9348f97202 -s ours am: 2acf4490ca -s ours am: 4db5b70bc1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I96be13aea3050fd13e840662e6ab71b2fe1918de
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions