diff options
author | Bo Zhu <bozhu@google.com> | 2018-05-10 09:21:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-10 09:21:18 -0700 |
commit | ad3c9066effc98775ba26eb517e3369884b04122 (patch) | |
tree | c6706773c2217448d9666b421346a0ab9af57b24 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e37830417dc4001548d3bed312f872aa10cfe939 (diff) | |
parent | 4fabef2d66877b04e5bfc81730ec3450f8d78963 (diff) |
Merge "Revert "Change the root of trust for CryptAuth Vault Service"" into pi-dev am: 3b0f011709
am: 4fabef2d66
Change-Id: Ibbdf78fa96c748145775c9a4f556eaf739924426
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions