diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:48:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:48:05 +0000 |
| commit | 728bb7a0b268678e7f5bc062bb262bfdc12b05f7 (patch) | |
| tree | f45657f2a4aea4206625a75ea3aefeffa1a03760 /core/java/android/widget/TextView.java | |
| parent | 1298528c2b07ca13a49fb3539e66fd64732e83e4 (diff) | |
| parent | ff7e46cbfa330d9042f737804ec95ab61c66233b (diff) | |
Merge "[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into pi-dev am: 44dc2b273b -s ours am: 34709e93e6 -s ours am: 36fbfc6d1a -s ours am: 01a542b340 -s ours am: c63f658ff0 -s ours am: 864ff0fff1 -s ours am: 010acb9847 -s ours" into sc-qpr1-dev-plus-aosp am: ff7e46cbfa -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: I818a0673d3cd09d06087caa4faa5ee9d77927a55
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions