diff options
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | 2021-08-25 14:27:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-25 14:27:23 +0000 |
| commit | 85d98a2a91d9738be96f938162a5702c1a603fda (patch) | |
| tree | fdbf0cd73e948ea5b669ed7619a0c910eb71d7a0 /core/java/android/widget/TextView.java | |
| parent | f9646b05ff87fb2f2e2115bec0726e49047e5330 (diff) | |
| parent | 01b398fb863c7ba6456bc53c47ef5388aa332ede (diff) | |
Merge "resolve merge conflicts of b0a08742901a97e73d67ade11fb0ebb22cf457ec to sc-v2-dev" into sc-v2-dev am: 01b398fb86
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15652490
Change-Id: Ia5556bcc3a883ede3fc8b3dce0ef7a332b4b5781
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions