| commit | f0a33063e82ffb502d2b156446c37e4ee45e2b06 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Thu Dec 17 00:47:29 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 17 00:47:29 2020 +0000 |
| tree | a3621012432267c9af96859b05f67b93f5ed18d1 | |
| parent | 01cd87c421a5c2859194957f6c6b87f268403762 [diff] | |
| parent | 6b1dcd9930bc5c2512c6e61e113999cd663018ef [diff] |
Merge "Make AndroidKeyStoreLoadStoreParameter public" am: 697c19be17 am: 6b1dcd9930 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531239 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I12464bde840b2d1fbb4893554704c351883aa34d