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