summaryrefslogtreecommitdiff
path: root/libs/androidfw/AttributeResolution.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2024-05-03 16:14:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-05-03 16:14:02 +0000
commit609cd02210fe05bf2fe906e580c175630e3a5b6d (patch)
treeb54b69ba826b2195623d70467b331b4f7de7ee5d /libs/androidfw/AttributeResolution.cpp
parentc80e93e51e72fd5b30f2eff93dfa8dc35936a6a6 (diff)
parentae26bcdc425ab6f2c91ad59687f2c7afb6d1c7ad (diff)
Merge "Copy KeyStore.UID_SELF to KeyProperties.UID_SELF" into main am: 00305306aa am: ae26bcdc42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3061906 Change-Id: Ief8ce423d798916c85e2c42b0ce27aff5adcf054 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