diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:35:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:35:12 +0000 |
| commit | 79b956b0d951494487ae6adbd76f3b76bb67d211 (patch) | |
| tree | 2aa75931e8df4db1b15451a99c866961dabbe82f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 25922a33b6885aaf7f1cabc3bd6223b3b38ced60 (diff) | |
| parent | d4006f983f5c4103c1afce5239e82559400eda4d (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11759020
Change-Id: I98a6dd7823aebd96de713def04ae5dd9fa6fdfce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions