diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:42:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-06 14:42:23 +0000 |
| commit | a30731741b3f70261d148e86c18d8a1c270cddfe (patch) | |
| tree | 5d2914bd3fcefe921818736883faa34dbcc7b566 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 609a3f458f6d397d527255f4dbfc1dac2196c151 (diff) | |
| parent | ebfbaee287b5e4fe30c51c6e6d5c9b2ded04537c (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 570c6a4e40 -s ours am: 70018d6989 -s ours am: 0b958c5e34 -s ours" into rvc-qpr-dev-plus-aosp am: ebfbaee287 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11753726
Change-Id: I7d8e0431b39220a455a8f072d912c1cae63821c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions