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