commit | 551a79c138e3ecd1fe67f0f17bc1d2757b6ce143 | [log] [tgz] |
---|---|---|
author | Brad Hinegardner <bhinegardner@google.com> | Mon Dec 04 00:00:41 2023 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 04 00:00:41 2023 +0000 |
tree | 35b0d8144c84d4ecbcff340c479ddd37fb564d78 | |
parent | 88a14ceb2ca7e4d5ebbeaf4c6eb7528dfc96c623 [diff] | |
parent | 7fbc8a0ea69fbf97480e28cbf233022ed9005829 [diff] |
Merge "Reset screen timeout upon keyguard touches for nssl migration" into main