diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-06 02:23:17 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-06 02:23:17 +0000 |
| commit | eef6e33c8feb64eb319c06bc8cd38d232b8dd654 (patch) | |
| tree | 3573ae98fa9743cf9d674ee77a6a9ba9d21d4717 /core/java/android/widget/ScrollView.java | |
| parent | 4a81b35ebcec2acd534261b02889e69f50545d1f (diff) | |
| parent | 72946e94ac4d1d80555884f8b4e77e40697b9f94 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b415ead18 -s ours" into sc-dev am: a71fe535c8 -s ours am: 72946e94ac -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209698
Change-Id: I11f48842f35a28fe5768f578a1f13c855d02bc12
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
0 files changed, 0 insertions, 0 deletions