summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Ben Lin <linben@google.com> 2024-10-08 14:38:25 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-10-08 14:38:25 +0000
commitb2dd1a1aadb798ac0660d822ad371ae5fc4ab853 (patch)
tree2f742c16b6db88878792ae1170b8875c78ac8e0c /libs/androidfw/ResourceTimer.cpp
parent36cb027c81ac78450a36d9edd979d7768997312e (diff)
parent5a4166738028356c3ffb9cf99debcd12688b68dd (diff)
Merge changes I3d770b41,I5e5890d8 into main
* changes: Have Keyguard drive Unlock/Lock transition directly to Shell. WindowContainerTransaction: add KeyguardState.
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions