tree 4f7afdda7520c05cadd7024f801abc99e17d5d34
parent 0a5b54560d233ac87dfbcd5b7ec4916b443a1539
parent c6a25527c484db1e0436a5356efcf35a41d3fed5
author TreeHugger Robot <treehugger-gerrit@google.com> 1585927007 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1585927007 +0000

Merge "Allow userActivityTimeout override when keyguard is showing." into rvc-dev