summaryrefslogtreecommitdiff
path: root/libs/androidfw/ResourceTimer.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-01-30 01:11:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-01-30 01:11:04 +0000
commit06a905a7c682ed33bda636667bbe3349f730ed95 (patch)
treed7fba8b0df0b9159536f8a558cbb502e9bd22a4c /libs/androidfw/ResourceTimer.cpp
parent46fe04e14e0e91079bfb3777b54890070ed40dea (diff)
parent63f5f3567c6a40bf51fca90ef293b534bec6a2ed (diff)
Merge "Avoid NPE when trying to unlock user with wrong token handle" into main am: 5197fd2fd4 am: 63f5f3567c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2928493 Change-Id: I6c2595ff534aac51d0a12ee534081e0a9b5241de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ResourceTimer.cpp')
0 files changed, 0 insertions, 0 deletions