diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 01:32:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:32:23 +0000 |
| commit | 6333a07b2963b3ae5b8efa481dfd4776ed506055 (patch) | |
| tree | b9a610ebec2d19f7047e68d3ca812de04c8783ce /core/java/android/widget/TextView.java | |
| parent | 6764f675f17a6739f2c8841474e20f098be1c3c2 (diff) | |
| parent | a1bd44815c78a35ac0f19053f14c20a317bbe5cb (diff) | |
[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: 5d9e072094 -s ours am: 93ad5f4560 -s ours am: a1bd44815c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: I6439302d38b74a0ba4de85944a20104c38d2b7ea
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions