summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Eran Messeri <eranm@google.com> 2023-01-31 19:12:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-01-31 19:12:50 +0000
commit96c2a6b2cf78dac27a354191cc4e0cff05f8d7e2 (patch)
treef2d677dc5798e98524ce905d576873c275b856af /libs/androidfw/ApkParsing.cpp
parente001eaf171acb5d3b893e4836358fea84fdafa5a (diff)
parentae6d7db49a801ffd2a5b5b004d5c6ac5992ad64a (diff)
Merge "Keystore: Attestation fix in AOSP builds" am: ecb4b6d158 am: c17512848d am: ae6d7db49a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2237500 Change-Id: I5e46aa4ad3b0f5492544d8844522697b28e933ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions