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