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