diff options
| author | William Escande <wescande@google.com> | 2022-01-25 16:17:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-25 16:17:41 +0000 |
| commit | ca3d992029483b17101f43c4053fae7cf527a1af (patch) | |
| tree | 0a0ba9424993bb70d276d790f177752b309f66fe /core/java/android/widget/TextView.java | |
| parent | 39000cbc73b49ca5b19c9c77baefa8c5eef861d0 (diff) | |
| parent | 35dda7049d12cdd45bd8d9a20bce9c0ed25933ba (diff) | |
Merge changes from topics "bluetooth-localsocket-from-filedescriptor", "localsocket-from-filedescriptor" am: 63c3c1f3d4 am: 35dda7049d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959006
Change-Id: I54af930f3570d738530d1020c94719b32139ae60
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions