diff options
| author | Christopher Tate <ctate@google.com> | 2014-03-05 22:17:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-05 22:17:21 +0000 |
| commit | 777b8a808ee76401429f7210ebb7194632040d45 (patch) | |
| tree | a0bdcd772eb7d71fc80f3e4eb77f52d2b8288ec4 /rs/java/android/renderscript/RenderScript.java | |
| parent | a258b4a9e8a519c3b181848c9b8fb2f0e2142d8f (diff) | |
| parent | 422b2656741520448815b230f7c73ad67a4c4e95 (diff) | |
am 422b2656: resolved conflicts for merge of c45ff35f to klp-modular-dev
* commit '422b2656741520448815b230f7c73ad67a4c4e95':
Adapt to underlying changes in the PBKDF2 implementation
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions