diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-12 01:07:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-12 01:07:05 +0000 |
| commit | 30f8a371b73d2ad9abcc088e78a6726ed2efc082 (patch) | |
| tree | 8a61c09dd54e0c8b08eb50f5ae18decf822905a1 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 87960020f2a405d1bd149114d5ca77b0932a2a6c (diff) | |
| parent | cf7203f5d36fdcd81a205dc48c67d144d1334508 (diff) | |
Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891acbe am: 4ac4916c8d am: cf7203f5d3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions