diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-22 23:16:56 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-22 23:16:56 +0000 |
commit | e3409f7af4a85914945a13f9cc87fdcf1577b51d (patch) | |
tree | 200f3a5cc6170a72c99409973f8c4c52de312e62 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 3daf8b89471187517e5800f6470595fcd540da7a (diff) | |
parent | 738d6b3be48f5a4559ded6339a3e1348249bf213 (diff) |
Merge "Keystore: Fix Device ID attestation test." am: c56709a2c4 am: 738d6b3be4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1646359
Change-Id: I3088d4d48728e24d4e81250eaac77147da0bd19c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions