summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-02 18:09:57 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-02 18:09:57 +0000
commit7563b549a7f365119e1e562ec68c5c3c7429e760 (patch)
tree0ecad090a8650c68d57f28f2e0ab468430573e33 /core/java/android/widget/TextView.java
parentc5b96ff5dfa6c1ef7f79e0e8cce5c9d4649277fa (diff)
parentfa9529f200ca43a834068eba894a3a32bd545ec6 (diff)
Merge "Merge "Acquire the wake lock to ensure RoR isn't delayed" into sc-dev am: ccb1454324 am: ce10bb2092" into sc-v2-dev-plus-aosp am: fa9529f200
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15179388 Change-Id: I1447831ff12649a53843aed622c5e3e86f951e0f
Diffstat (limited to 'core/java/android/widget/TextView.java')
0 files changed, 0 insertions, 0 deletions