diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-07-06 03:16:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-06 03:16:37 +0000 |
| commit | 9ed237f378dce55b54315c47caa311b26d17b884 (patch) | |
| tree | ab2e411b752d7ad632be7a3fb86e86fc17bf0bb6 /core/java/android/widget/ScrollView.java | |
| parent | 47c40f3f3c8b3fd5b5a40e5ef23f6bdacb5a40b7 (diff) | |
| parent | fdeebd0eb21ee0ca157b6969cc56ec3fe29c6f51 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: d6540af794 -s ours am: 49798854ff -s ours am: d63445360a -s ours am: fdeebd0eb2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15209025
Change-Id: Ie4cc1bccd9b533479c6b1dea1259b76b1605a215
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
0 files changed, 0 insertions, 0 deletions