diff options
author | Alex Klyubin <klyubin@google.com> | 2015-04-01 01:27:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-01 01:27:41 +0000 |
commit | 9c0f257f0080aba0743f34fb6202215fca295146 (patch) | |
tree | a4c372249befe368a45f2961c5d4128a97ba71da /rs/java/android/renderscript/RenderScript.java | |
parent | 8bed4843dc7f93a30e607dbb11012a04ca5dcf95 (diff) | |
parent | 19e79e12d82fa473f2f7beec337de11a0c3b3a03 (diff) |
am 19e79e12: Merge "Add SecretKeyFactory backed by AndroidKeyStore."
* commit '19e79e12d82fa473f2f7beec337de11a0c3b3a03':
Add SecretKeyFactory backed by AndroidKeyStore.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions