commit | 84a37a092cd5d6f54b4a519b5d88882d343d8f8b | [log] [tgz] |
---|---|---|
author | Beth Thibodeau <ethibodeau@google.com> | Thu Sep 09 16:54:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 16:54:48 2021 +0000 |
tree | 4d3f1466b7901e766c628c3ea3586fb8b502ec64 | |
parent | a832929c3c53e0ca1b783b6cf5e3e458e9f5e1bc [diff] | |
parent | 6ff8a0f6923ef2128b730709d8be9c4db6d74159 [diff] |
Merge "Time out resume controls" into sc-qpr1-dev am: 6ff8a0f692 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15677510 Change-Id: I759d5787674a428ab85c5088df5a5637e0403f32