| commit | 2fd2954c84300c40f5f480cfa1b7d3a871e13bfb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Mon Dec 21 19:18:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 21 19:18:15 2020 +0000 |
| tree | 325d43ae849d7bcc6b37aed015111e3706eff21d | |
| parent | 89b7dc3a1729e5e933827c171e6d3e50a35b7185 [diff] | |
| parent | 1769b6bd161d560adb77b7f1f57f903bf169a4fe [diff] |
Merge "Keystore 2.0 SPI: Switch to aidl union KeyParameters" am: 220d33ce2c am: 1769b6bd16 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532513 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea89c2f9bc39074abd234faf8dee943cad8f65d8