summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-02 03:04:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-09-02 03:04:05 +0000
commitfe11fe4765b15bde34baccafa98cdfc433d46742 (patch)
tree983d407984991d03dd12090f329c70bcecca2409 /core/java/android/widget/TextView.java
parent5b482111642a9621233ea43d7f0caf597048947d (diff)
parenta5e08d369549271495794504f2a26fa6d8db563b (diff)
Merge "[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: fab3756f04 -s ours am: bab5d4d271 -s ours am: 9f0002fe36 -s ours am: 440895f033 -s ours" into sc-v2-dev-plus-aosp
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions