diff options
| author | 2021-02-08 17:47:26 +0000 | |
|---|---|---|
| committer | 2021-02-08 17:47:26 +0000 | |
| commit | fccde53e0aa75aa9c3530dccd4db47f271979aea (patch) | |
| tree | 97cef26c76a1a9b2da44236adafcd5a884100d8a /libs/androidfw/ObbFile.cpp | |
| parent | 5195eb9abe2f27ab665d82567a70276e94f99774 (diff) | |
| parent | 4b875e55240a19b4f80ac07392ff6bdd8ce6fa0b (diff) | |
Merge "Keystore 2.0 SPI: Add CERTIFICATE_* tags." am: 14a82f7983 am: 4b875e5524
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566352
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I46e4bf75482d4366fa852ce0708483beddd32fdd
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions