diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 02:04:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 02:04:48 +0000 |
| commit | 182e39ddee621439b042282a476223abba27d3bc (patch) | |
| tree | 0c289bb104102ba92719262ae06ae513b171fe18 /core/java/android/widget/TextView.java | |
| parent | 241938533f43265347e28f7ec1b4672d8c861f31 (diff) | |
| parent | 20a6b119ade3d62c3a2c98fc68342c1821335bc1 (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: 010acb9847 -s ours am: 611b333097 -s ours am: 20a6b119ad -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: Ia1a424a9940149286a49306660ba48a168657a33
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions