summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-09-02 03:03:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-02 03:03:32 +0000
commit420f66090cc2e6f15e8a7cf697e238b6597eb4ce (patch)
tree983d407984991d03dd12090f329c70bcecca2409 /core/java/android/widget/TextView.java
parentc969964d21db51890c1565308a709a2ca42ecdb4 (diff)
parenta82a3550832ce30328dc60770aa01272ec0b00d3 (diff)
[automerger skipped] Merge "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" into qt-dev am: 204ab511e0 -s ours am: 5a1724e2ce -s ours am: 037fa26965 -s ours am: fab3756f04 -s ours am: bab5d4d271 -s ours am: fba68dbe60 -s ours am: a82a355083 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710 Change-Id: I8eea08092531bb9c5185e827e5dd0973310fbc93
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions