diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-08-24 18:55:04 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-24 18:55:04 +0000 |
| commit | ff928967e9bbb2aa90faa1aa8392e1515ca44707 (patch) | |
| tree | 1cb856fcf58164e9853e88b3b23c33be4fb8025a /core/java/android/widget/TextView.java | |
| parent | 53fe48af5db20632684731beeda6bb8032cb72ac (diff) | |
| parent | 202a8319edc695436e771dd93ee545f27b68f03f (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: 202a8319ed -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: I076ac383be48495783033aaba7c3654ded12b8ef
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions