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