diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:04:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:04:14 +0000 |
| commit | eea748329dc7e22fe23e7ccc676c22cfc2815ee8 (patch) | |
| tree | 0c289bb104102ba92719262ae06ae513b171fe18 /core/java/android/widget/TextView.java | |
| parent | 3ad7497de3e07d5f5c825fe8d9680445b8c95cca (diff) | |
| parent | 728bb7a0b268678e7f5bc062bb262bfdc12b05f7 (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: 728bb7a0b2 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: If3f35b9fe973581e2c7180c8f9fd7985713cbeb9
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions