diff options
| author | Bo Zhu <bozhu@google.com> | 2018-04-13 00:39:18 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-04-13 00:39:18 -0700 |
| commit | 48b5b445b7fe18389e6b6c48eeab283b30baa8fd (patch) | |
| tree | 495335b471561a47fc6de6ba4573b6d253fe9ce7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3118c5768a121313d76bb52e65583d042a31d78a (diff) | |
| parent | 2bc6f2e46afbeca482f5fa4ea3ef43f7f7dd6e8f (diff) | |
Merge "Use Scrypt to hash all passwords in RecoverableKeyStore" into pi-dev
am: 2bc6f2e46a
Change-Id: Ia9ed056e9b33ec7375a3b61ece17f22eb1d16f0d
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions