summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-10-05 14:17:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-10-05 14:17:57 +0000
commitc182dfe86e32fd25765fe87985ae9fb124e380e2 (patch)
treecb500c2f28a172d3d8ac5c0889b2f964cfe1414f /libs/androidfw/ObbFile.cpp
parent912d2a7bbe3e25a32d1192c9c8df349a6e471b39 (diff)
parentb569a0c56c46fad4792db68e4c8db720eeee17d1 (diff)
Merge "biometric: Add support for KeyAgreement to AndroidX's CryptoObject." into main am: 2bcc7900ba am: b569a0c56c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646885 Change-Id: If743e786ffcbd2cbcf4b4a81cf485dc143e907dd 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