summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-10-31 17:31:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-31 17:31:34 +0000
commit26cdb17895df73505b205964cfb78ee8ef9729a5 (patch)
tree63ee998c417db567ad860624abbebbce84ca9c95 /libs/androidfw/AttributeResolution.cpp
parent067c153ffeb3ad38d2341d15a15953b390a2fa89 (diff)
parentf6a3088f600636e54886493ae6a5e960c25f177f (diff)
Merge "Always set CE key protection in migrateUserToSpWithBoundKeysLocked()" into main am: 2a654f1aac am: f6a3088f60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3325961 Change-Id: I9e8b8157d95eed8c66a91ceb48f3f0edf93fe288 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