summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorZoey Chen <zoeychen@google.com>2021-08-24 14:34:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-24 14:34:00 +0000
commit7d95ae6ab3e35d175dd95fa8bd4523181285ec11 (patch)
treef6153d79d360bb48140d0a9ecbfa29d419efc594 /core/java/android/widget/TextView.java
parent553c4b783b3480e5fde1de94b5acacb0105c0734 (diff)
parent0fd6b2ca4c24d476533af21e75bdc39baf894e99 (diff)
[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78ce2 -s ours am: 0fd6b2ca4c -s ours
am skip reason: skipped by user zoeychen Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542636 Change-Id: Icac9a1cb8e3313988bc4a48122a194ffe0b33e11
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions