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