summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorJunyu Lai <junyulai@google.com>2022-01-06 14:09:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-06 14:09:31 +0000
commitd312550ff8a7cf8fd33698216634b296010daf31 (patch)
treebef955ded6042e9b702313940197e2f563e88b01 /core/java/android/widget/TextView.java
parentbbc431f3eaee29f83056f41ce5bd1ee936d89928 (diff)
parent08c51b04ca7a3a807ffbb07a3d9dc086eb4af5b6 (diff)
Merge changes from topics "ms34-tm", "ms40-clock" am: beb9fb3cc8 am: 08c51b04ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914533 Change-Id: I244779c19fab00eede1b7e9f3980679131e75cbb
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions