diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 09:17:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 09:17:54 +0000 |
| commit | ae40a7a4dd84f4861a489fa31f284947887a480e (patch) | |
| tree | a9859c2d319146bbdfac08e90e468347981a74ad /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ef63c4bfae21d600d973f5a8cd1e117d6ddd29e9 (diff) | |
| parent | 8960307ee44f3cd79eea4838bb60ab67fbaf5626 (diff) | |
Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 64aef342c9 -s ours am: a957158cc7 -s ours" into rvc-d1-dev-plus-aosp am: a60c18f443 -s ours" into rvc-qpr-dev-plus-aosp am: 8960307ee4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12026906
Change-Id: I108001515fec45f4fc77ac016f191d7a12e5ea5f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions