summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-10-31 16:57:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-31 16:57:13 +0000
commitf6a3088f600636e54886493ae6a5e960c25f177f (patch)
treea8ab8c1fd3499c92940cbc0d9fe303c12da6f685 /libs/androidfw/AttributeResolution.cpp
parent593713cc77274c87c63e1f5292fccff918a74f57 (diff)
parent2a654f1aacdb74e714629ed9eb7c58fdf19ca9a9 (diff)
Merge "Always set CE key protection in migrateUserToSpWithBoundKeysLocked()" into main am: 2a654f1aac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3325961 Change-Id: I925f3425f44850f80734c96efc685ab2c33034ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AttributeResolution.cpp')
0 files changed, 0 insertions, 0 deletions