| commit | e03edfc480a6969f49b8c35e0b1bbf22d4c89677 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Mon Jan 09 22:04:33 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Mon Jan 09 22:04:33 2023 +0000 |
| tree | 65260259418173beabcb7083eda429d52ee967b6 | |
| parent | 69fca0ea20afd9b3899f3e8d2c68c020269a0d49 [diff] | |
| parent | 2fd70caef07f1cb675bb83c775243544ca82264a [diff] |
Merge "Bouncy Castle: Add support for PBES2 encrypted KeyStores." am: 95b3809836 am: c2c44ab06a am: 2fd70caef0 Original change: https://android-review.googlesource.com/c/platform/external/bouncycastle/+/2096606 Change-Id: I02ade7a54b0970494346d015533f77f9003bb4a8 Signed-off-by: Automerger Merge Worker <[email protected]>