diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:34:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:34:16 +0000 |
| commit | dd89dd54b16bf5e9a00778e86b4cc188697ce520 (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 445c965e5c1f78d95dc2b3266636c41b2b4bfcf4 (diff) | |
| parent | 4c526e22cf4a933190b111570cb70047e88b8d57 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f192f44d7 -s ours am: b30a1434b9 -s ours am: 9b4bf2cbba -s ours am: 4c526e22cf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086504
Change-Id: I59e0e9bc40dd859a66711d2fc3a1dee1d00c2a77
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions