| commit | 55aca3e1a742d615d3c67ff38a26d38374bc97a8 | [log] [tgz] |
|---|---|---|
| author | Beth Thibodeau <ethibodeau@google.com> | Thu Sep 09 16:29:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 09 16:29:25 2021 +0000 |
| tree | 95ccb080f110e0ba2809c7f35c215ac336cb8395 | |
| parent | 4fcdb99cebe530ba6f9e948cbb0516bc46938fcb [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: Id1e8441d74e837c5d418f8c2290dbbbf1f922616