commit | 415d8bee3ca29d907a66f6dfa9bfd1c5608c5be8 | [log] [tgz] |
---|---|---|
author | Beth Thibodeau <ethibodeau@google.com> | Thu Sep 09 17:41:44 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 17:41:44 2021 +0000 |
tree | 07c25c4df3ba278b47db2da71af5aa53dd0092fb | |
parent | cda0e44fb5b3791d68441782b3f7beb2e9556c6c [diff] | |
parent | 13b46d350be965de654a675e199aa9803b14b522 [diff] |
Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692 am: 84a37a092c am: 13b46d350b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15677510 Change-Id: If3b0e5ec7f8007540ad5cbf93bba09feafbc77ce