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