summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2023-12-06 21:17:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-06 21:17:59 +0000
commitd279995264291f1e85eaa4797bfeccf0b8ac55bd (patch)
tree8b3cb5ebc65c131af663657e61e3ac349e0f2dac /opengl/java
parent680dac39d073f0c2d742b9a7934e40e93af17768 (diff)
parentd0869578ea340bf6afc666d4fba71939373fa826 (diff)
Merge "KeyguardManager: clarify behavior for profile with separate challenge" into main am: aea7009e41 am: d0869578ea
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2850163 Change-Id: I7eadfcdb78433e6d744342a0de99ff3577073ca3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions