diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:26:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 20:26:20 +0000 |
| commit | d697debafbd49e5eee88d6910887874bc1d53ee3 (patch) | |
| tree | 0ca29050c695c71f21b0ba3146bb36958d7ae713 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | f05b1658cc67a54fe5242487701425b36d5f8f60 (diff) | |
| parent | 561722247abdc146e83c3c31d63e28860924a8a9 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8bf888c7e9 -s ours am: ccaa8826eb -s ours" into rvc-qpr-dev-plus-aosp am: 561722247a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12198207
Change-Id: I1b48caaaebdc63d15100848997a0e1cb595770b0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions