diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:49:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:49:31 +0000 |
| commit | 952b2049b2594f6713743e0f44f88e4c084d620c (patch) | |
| tree | 8ec08525b1cce5c6ff6c7cc0ab31e75de2e68ef5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 736fb4a4b83278d76a3524fb7bd03caa91454449 (diff) | |
| parent | 79b956b0d951494487ae6adbd76f3b76bb67d211 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 80e43d2ed7 -s ours am: 617c70f07f -s ours" into rvc-d1-dev-plus-aosp am: d4006f983f -s ours am: 79b956b0d9 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11759020
Change-Id: I9078a1633a0820d372858d6fc105cbd111fd815b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions