summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2021-10-16 00:14:06 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-16 00:14:06 +0000
commit1054f7e5c77aa9a007dc324737c20964106f9451 (patch)
tree12a4ceca890b08ebe1292a6d61eaf52bd2e2c4c9 /core/java/android/widget/TextView.java
parent451d8a60b650eccb25665887cd5420f55a4fd540 (diff)
parent5e9b4cb84b03a52e54313b1cab7b70fbce72572a (diff)
[automerger skipped] Merge "Fix an issue in NPMS blockedReasons computation logic." am: 37e891fce1 am: 1af3bf14da am: 9d1e073b23 am: 1c6a76a579 -s ours am: 5e9b4cb84b -s ours
am skip reason: Merged-In Ibcae147bf4ba84ff91ef7038ffef8c33082b82ca with SHA-1 e9982844df is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1860033 Change-Id: Ib32f662626aba304b6f9262f29ba6af1dc836906
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions