diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:23:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:23:37 +0000 |
| commit | 1bfa101792454f603ed58f398516884dd2ba56f5 (patch) | |
| tree | 4dc1880b8fa57b28ce990067e0049c0f065dcc8c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2d130de0977f5daaabb6fa38f1e2e8a6e3619b42 (diff) | |
| parent | b5de0ccd474a8ad7697159e75b34350c7e23da35 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: b5de0ccd47 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503
Change-Id: I579da36e0e815c84f7fd7a0f3f25f2eb03ce07a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions