summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2021-11-02 23:55:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-11-02 23:55:40 +0000
commit5a90a69d03f6a6e5f43c249c3a8b02cda9fa6c87 (patch)
tree2475a716535d3b77cd71c7a5112c41a2e7b85808 /core/java/android/widget/TextView.java
parentd24e3c5c42bc0716be980c98001990912987f449 (diff)
parenta2d1cd726238dfea2b11848d245266b23e9554b1 (diff)
[automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: a2d1cd7262 -s ours
am skip reason: Merged-In I5ff5973c95868bee2b7444ecded7443d6e6429c9 with SHA-1 d24e3c5c42 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16177176 Change-Id: I7a7c89141b9e68270f2ed2e71fbaf8b076b6068c
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions