diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:28:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:28:14 +0000 |
| commit | 2750013c8717bd9203d07a70d561b6d54761874c (patch) | |
| tree | 3905411e667d2ff53356e06be0d975bfd0957e9d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a06970a74280fb65c84f9d6d626b5ee23f74beb9 (diff) | |
| parent | 4367680f479f5c20b7a3a81777ca01b029efb98f (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: 4367680f47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12079852
Change-Id: I93db19fe30c879944984529f64cfbc84bb9c4ad6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions