diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-09-02 01:49:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-09-02 01:49:03 +0000 |
| commit | 20a6b119ade3d62c3a2c98fc68342c1821335bc1 (patch) | |
| tree | f45657f2a4aea4206625a75ea3aefeffa1a03760 /core/java/android/widget/TextView.java | |
| parent | 016da874f9177549b4f82b6c200f7aef9795e489 (diff) | |
| parent | 611b3330977d1ad78f7750ef9c1e08528c5d488c (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616708
Change-Id: I656a4fe89b1d8eb7c62b57575157d3bffda1c0aa
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions