diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:13:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:13:09 +0000 |
| commit | 195fb55d9bc3c1733f0e6028bfd92aa6a5cc83cb (patch) | |
| tree | 4d8fdf6881f2c44b178974a187424116403994c3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4367680f479f5c20b7a3a81777ca01b029efb98f (diff) | |
| parent | 90c00b95869b20cfa52ec3d30785288de61e7f26 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: 90c00b9586 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: I3f828f14e274636e50700453900ff39ccc92b884
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions