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