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:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-02 03:03:58 +0000
commit5b482111642a9621233ea43d7f0caf597048947d (patch)
tree983d407984991d03dd12090f329c70bcecca2409 /core/java/android/widget/TextView.java
parent47e341f7ce60e3ab42d8c7b0e4d749b33be6dd5e (diff)
parentce48ff15be752796f3ee8ec9a27c4ecb5536e057 (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: 9f0002fe36 -s ours am: ce48ff15be -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15616710 Change-Id: I135254e669b65f8f9d63aabfd867d08c050d85b8
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions