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