diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-16 23:17:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-16 23:17:12 +0000 |
| commit | eb9cf95d7f80427aa8010a34258e9afe5a876daf (patch) | |
| tree | 7dc198549c69ec436f38c73d6735ecad49050cda /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 37fa2b76f1e830ea31f3686d3f8d6df038d134e4 (diff) | |
| parent | e7c4ffdae2cd5939158a8142a7eb0d4dbef35c68 (diff) | |
Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 1ef847338e am: 4ed74ba3f1 am: e7c4ffdae2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519257
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic35ee1e49978c705ca765e4c8fbe7117c398abc0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions