diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 17:39:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 17:39:16 +0000 |
| commit | 40baa2365da27232350f363fcacaf0e3dd50ce0f (patch) | |
| tree | 4097f89531eabc47b5c03d1403efe35e6c50dd7a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ce237e39deda8e0e26b4660d1524d2c6a7306ee7 (diff) | |
| parent | 5d3e2c1e425b5be71391ecc199f9e19dc5fa051a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: c83b93b3f1 -s ours am: 75c3356103 -s ours am: 22810521eb -s ours am: 5d3e2c1e42 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12087182
Change-Id: Ibab07de03b81b844e581c235a282aec7ac4790b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions