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