diff options
author | Alex Klyubin <klyubin@google.com> | 2015-04-07 17:58:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 17:58:00 +0000 |
commit | 4b79bbeaa3c6a8820fe83aa75179b6cae550320f (patch) | |
tree | 29ac46002d626c115158450da6f246a9595982d7 /rs/java/android/renderscript/RenderScriptCacheDir.java | |
parent | aa94389ba2f848a98c74b439da6ea8c3329668ce (diff) | |
parent | 558184f52fa7822a0bde230a93e552f137ac91a4 (diff) |
am 558184f5: Merge "Make the new AndroidKeyStore API conformant."
* commit '558184f52fa7822a0bde230a93e552f137ac91a4':
Make the new AndroidKeyStore API conformant.
Diffstat (limited to 'rs/java/android/renderscript/RenderScriptCacheDir.java')
0 files changed, 0 insertions, 0 deletions