diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-06 14:36:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:36:15 +0000 |
| commit | bfb339a09827231dc2150ef038d8d81bc81e4ff3 (patch) | |
| tree | 14c2f9a0d1746438eb6ef897297c6b0c8e48e4a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b578f40416efa47e8fd5b6d88b774dad64ecbccd (diff) | |
| parent | 2d130de0977f5daaabb6fa38f1e2e8a6e3619b42 (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: 2d130de097 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086566
Change-Id: I4d1b221be2953c66a514c96e96006ef7c65fb179
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions