diff options
| author | Christopher Tate <ctate@google.com> | 2014-03-05 00:57:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 00:57:22 +0000 |
| commit | c45ff35f21cf84b6d31cf57ea4db1af0732da07c (patch) | |
| tree | fc0df03835eab9d961478f5da8ebf9e95ed2f9fe /rs/java/android/renderscript/RenderScript.java | |
| parent | a6c59158761423551941f6ed338a117658e581ad (diff) | |
| parent | 1efc6e52d65389463ad52c32df02d68493df0f48 (diff) | |
am 1efc6e52: am 1d13f13d: Merge "Adapt to underlying changes in the PBKDF2 implementation" into klp-dev
* commit '1efc6e52d65389463ad52c32df02d68493df0f48':
Adapt to underlying changes in the PBKDF2 implementation
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions