summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Eran Messeri <eranm@google.com> 2023-12-07 16:59:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-07 16:59:56 +0000
commit643bc8dc7b5a4d55e6d934c9209f541eee826694 (patch)
treee5f57cc54f29c41ffb274b0b84c868907cd57b21 /libs/androidfw/ObbFile.cpp
parent6933a9661d5d23f8377715c72a5f32c698ad4c93 (diff)
parenta20e3abb31408d97c6d68ccdcbc8dde6656c51ee (diff)
Merge "Revert^2 "MGF1 Digest setter: Handle case of flag off"" into main am: 9fa4063071 am: a20e3abb31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2854787 Change-Id: Ib044915548b0bc249b396a21e4af1be7b9e599ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions