diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 03:05:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 03:05:27 +0000 |
| commit | 7d94e97801443059014cc8fa3ff0a87ba5330285 (patch) | |
| tree | d06db12f60335748dbcf99b414cf06d9ac416ca7 /core/java/android/widget/TextView.java | |
| parent | fa2114888e666a919cf69f7574c6fc0343e1f313 (diff) | |
| parent | fe11fe4765b15bde34baccafa98cdfc433d46742 (diff) | |
Merge "[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: fab3756f04 -s ours am: bab5d4d271 -s ours am: 9f0002fe36 -s ours am: 440895f033 -s ours" into sc-v2-dev-plus-aosp am: fe11fe4765 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710
Change-Id: I5fce2473214efea9450444942348cacaeb867a43
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions