diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 02:03:56 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:03:56 +0000 |
| commit | 3ad7497de3e07d5f5c825fe8d9680445b8c95cca (patch) | |
| tree | 0c289bb104102ba92719262ae06ae513b171fe18 /core/java/android/widget/TextView.java | |
| parent | 26ce55d8bfbf969e6f15a2ac215050ca98cd576e (diff) | |
| parent | 1298528c2b07ca13a49fb3539e66fd64732e83e4 (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: c63f658ff0 -s ours am: 864ff0fff1 -s ours am: 3962b61707 -s ours am: daa58844c7 -s ours am: 1298528c2b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Ie769c2cca4188ae913e5577e5b6eadbc14baafa4
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions