commit | f82727e9e76f492463ada401e34eb762558b0f4f | [log] [tgz] |
---|---|---|
author | Joe Bolinger <jbolinger@google.com> | Wed May 19 21:07:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 19 21:07:49 2021 +0000 |
tree | 17c6207b99bd2d96a1fe9d20787de294ec115de5 | |
parent | e2606c07d97159b33df7b2b236a8eac27a7e715c [diff] | |
parent | c4d0afc24c5954d9902eaf11ffcf8ab0b7f92496 [diff] |
Merge "Respond to lockout reset requests from the HAL." into sc-dev am: 7f40c4b4ef am: c4d0afc24c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14519690 Change-Id: Id0d5acd30a3b51b041ff045d96400d08a338697f