diff options
| author | Zoey Chen <zoeychen@google.com> | 2021-08-24 14:45:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-24 14:45:44 +0000 |
| commit | 27d3d183bcbb4ad19fa7f84bf45e3f49f15a03a7 (patch) | |
| tree | 8ea335230bc0fbf17466b1678f54d2652112fdf4 /core/java/android/widget/TextView.java | |
| parent | 096ef10e4b6f3c2b62f01baf318a85ba4e4a741d (diff) | |
| parent | 8c89f842849e6ce3ef37f8d19ad0c78d01016454 (diff) | |
[automerger skipped] Merge changes Ib5ac6ee9,Ib127ad43,I37a423f3 into sc-qpr1-dev am: 1902c78ce2 am: 0c8f40b27c -s ours am: 8c89f84284 -s ours
am skip reason: Merged-In Ib5ac6ee909e666b66b41fd0069f6c9528858dd37 with SHA-1 51b6659ae1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542636
Change-Id: I49d1c4ed73092275eda15c9e37f24dbd15976221
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions