diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:34:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:34:49 +0000 |
| commit | 1c92dbbb2cf31626867eb24f737c327bda16de0e (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5db050142d68743c451945314cec810aa10bc893 (diff) | |
| parent | ef111c415131372b3de81c506a780bdda0e77498 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours am: 69c10a41ac -s ours am: c299f6aff2 -s ours am: ef111c4151 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086501
Change-Id: I2d85a256f9f6c5cc64ff1c4840a1342626e681bf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions