| commit | 9134b33d09e5502b357b3572cdc1014ee2422b73 | [log] [tgz] |
|---|---|---|
| author | Patrick Huang <pinchin@google.com> | Fri Jan 28 19:19:56 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 28 19:19:56 2022 +0000 |
| tree | 66865f076022056cc3c9e36f0cceecae78421153 | |
| parent | 26f213bc7f0642cdfc748fb3b10568e6dff27179 [diff] | |
| parent | 576dd5ee58548dbc2e903c104e61e18e75f7ef7d [diff] |
[automerger skipped] Merge "Add power button cooldown after emergency gesture is triggered." into sc-v2-dev am: 7f62909c98 am: 576dd5ee58 -s ours am skip reason: Merged-In I80dbfd5e297af6e62ecbd6593dd63686c1b7ac1c with SHA-1 c22b2a9520 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722352 Change-Id: I831473396cff6c3290f2df71b81c9d70988e947c