diff options
author | Janis Danisevskis <jdanis@google.com> | 2021-02-01 21:18:38 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-01 21:18:38 +0000 |
commit | e352e1f919fb0e2a4dfb4b61176bfd5058816bab (patch) | |
tree | 8e7c58d6a2e78a7e0063ed7816348d62e8debb89 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 38735b0af6cad53aba629efdeae00c6a103b57dd (diff) | |
parent | 69ffb7d1954cbabf014d86cb7a86731df2bd1e7f (diff) |
Merge "Keystore 2.0 SPI: Small fix to apease CTS test." am: f246dc6346 am: b30a7eb006 am: 69ffb7d195
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Idc461fac1698ab72d6fc7ce2b692197fc0f38f6b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions