summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorSongchun Fan <schfan@google.com>2022-01-12 03:35:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-12 03:35:11 +0000
commit8fc9723337e5cf1111ec18aa5fcb48615fcf5968 (patch)
treea594b54dab5d16b84aee9f218b860d29c20e5ccd /core/java/android/widget/TextView.java
parent91faf689a8309a091e50c6b16246994db0beb07d (diff)
parent696461f1a603dd9d19cab6b0e56564e1505ba9a1 (diff)
[automerger skipped] Merge "Persist destroyed staged sessions until they are cleaned up" into qt-dev am: 30348d5cdc am: ca4faab256 -s ours am: 18651732ad -s ours am: 1e04a9cad6 -s ours am: 696461f1a6 -s ours
am skip reason: Merged-In I4ede6b7a4b5d861e5c73f13884c7aa86cf7633a2 with SHA-1 731bd965fb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16575908 Change-Id: I52fd172a526fa3997483b850c716feb08b0a62a0
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions