summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ScrollView.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-06 02:23:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-07-06 02:23:14 +0000
commit4a81b35ebcec2acd534261b02889e69f50545d1f (patch)
tree3573ae98fa9743cf9d674ee77a6a9ba9d21d4717 /core/java/android/widget/ScrollView.java
parent14c26acb610cb3111df84cb21468da2ad62d33eb (diff)
parenta17c0e358f4f830717ddb976eea53cdc9d6e6d8b (diff)
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db19f8b717 -s ours am: 4a2d034bd7 -s ours am: 0e4a6cc6b6 -s ours" into sc-v2-dev-plus-aosp
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
0 files changed, 0 insertions, 0 deletions