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