diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-08-24 14:34:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-24 14:34:01 +0000 |
| commit | 8ae747efc4e5c8bf1b66592ce7f54c96fd7c6866 (patch) | |
| tree | 8ea335230bc0fbf17466b1678f54d2652112fdf4 /core/java/android/widget/TextView.java | |
| parent | 5b39b63327933eb4ce2b383ba38b8da3e9319118 (diff) | |
| parent | 553c4b783b3480e5fde1de94b5acacb0105c0734 (diff) | |
[automerger skipped] Merge "resolve merge conflicts of 23d24d1eb82678ca2b6b6e485de4c68f79f662f2 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: 553c4b783b -s ours
am skip reason: Merged-In I37a423f31ae80963147758160ac0234ae17469f9 with SHA-1 7b5e298218 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15664654
Change-Id: Id8349142a7f0729ff17983db7447bac1ad875403
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions