diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-01-19 22:58:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-19 22:58:21 +0000 |
| commit | 283c206e2acead85f2dfb1965dd7ab3fb8192c41 (patch) | |
| tree | eeeff9311b6cbd6a3e9ca654a17b4c049bcfcf9a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | da1039a9928bd8d229b0c32a971b72628889d71f (diff) | |
| parent | 73326c9ebe58a60e1b472a4cbb30ff23cd0f27c5 (diff) | |
Merge "Integrate IKeystoreAuthorization aidl's addAuthToken with Keystore SPI." am: 9740651028 am: fc80cfcd25 am: 73326c9ebe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553976
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia5eb3d8f5b47c833c087d65536b1ccf30b3b9ec5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions