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