diff options
| author | Android Build Prod User <android-build-prod@system.gserviceaccount.com> | 2021-08-25 14:43:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-25 14:43:16 +0000 |
| commit | 65e17d9809bb8cf515a2e7712b5886a8d825e54e (patch) | |
| tree | d11938becc493a6b312d8ed1ee3e3644cc023a10 /core/java/android/widget/TextView.java | |
| parent | 2b45d7cd3a92e26503479de4d94577b32473bf82 (diff) | |
| parent | 85d98a2a91d9738be96f938162a5702c1a603fda (diff) | |
[automerger skipped] Merge "resolve merge conflicts of b0a08742901a97e73d67ade11fb0ebb22cf457ec to sc-v2-dev" into sc-v2-dev am: 01b398fb86 am: 85d98a2a91 -s ours
am skip reason: Merged-In Id3aa20662df8cdd6676141f5f70e5eae0cec6215 with SHA-1 e8f14f4813 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15652490
Change-Id: I5f7e940c658bf96d0f67c99268310d53d81e177a
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions