summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorZoey Chen <zoeychen@google.com>2021-08-24 18:49:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-08-24 18:49:54 +0000
commit202a8319edc695436e771dd93ee545f27b68f03f (patch)
treea2e9a8ba092722592f9b9a2ca6dc765fa6f66513 /core/java/android/widget/TextView.java
parentb480567cd48ab94302755a5092a89479c9dabf30 (diff)
parent9d9d325efea87df5bc729d6c8f0dc52603b4c44d (diff)
[automerger skipped] Merge "[Provider Model] Cherry-pick from master ag/15008434, ag/15023697 and ag/15023698" into sc-v2-dev am: 9d9d325efe -s ours
am skip reason: Merged-In Ib127ad43831ada06fa6a07802b3648b30faac5b0 with SHA-1 bb2a5095a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15667823 Change-Id: I7ce0f82968f7de2ff6f0a6040827bb149bfc4200
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions