summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorBill Yi <byi@google.com>2021-11-03 18:08:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-03 18:08:25 +0000
commite043f7edae4333810dedb41c17b3c2f19c80f15b (patch)
treeaaee2d78b2f92d83477ccb1cdf1228c4182f1b86 /core/java/android/widget/TextView.java
parente13662e50fbc8230775f6a749421e671558c7c34 (diff)
parent982bb0f1458b6ae0b0c7300f233d7f2bfb318241 (diff)
[automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 982bb0f145 -s ours
am skip reason: Merged-In I7e267e3c046d726750180efa81806cbbefb17b68 with SHA-1 65f0c883ff is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1879184 Change-Id: I120288db48aef968559db3c48b4b358395f55219
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions