diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:57:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:57:03 +0000 |
| commit | 459fd156a12b65d35dfc869769ea8503f541a323 (patch) | |
| tree | ba6c3bc9147c41b0b3d62f48824d83f5832ad5cc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f3fd6cd7ef441fddb3ab6868183e091a00bed705 (diff) | |
| parent | 38957d5fba1a40cf5368e0b06e440eb80f2b7428 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 871647a491 -s ours am: 728faae9c6 -s ours am: 38957d5fba -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519385
Change-Id: I3e5f5f57bcf37506a90330b85ffb759478b01f2b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions