summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2021-09-02 02:51:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-02 02:51:08 +0000
commitda560dc916459d72db184fe9878ed5f42540164d (patch)
tree0c289bb104102ba92719262ae06ae513b171fe18 /core/java/android/widget/TextView.java
parent182e39ddee621439b042282a476223abba27d3bc (diff)
parent5ca612ec0c87aa036c13251801ec4c55ea6218fb (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: 5ca612ec0c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710 Change-Id: I58cd15d37af2697fc90a59e50c19ef8aeeaa636e
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions