diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-15 18:10:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-15 18:10:04 +0000 |
| commit | 763100e6442494a85cfcb7949c8021836071b1f6 (patch) | |
| tree | 824e4cc06f2c356f2fa185e5fd8611546bdffb48 /rs/java/android/renderscript/RenderScript.java | |
| parent | 360d0f615eebe5aba0fa574acf81459cca8dd1f0 (diff) | |
| parent | 1cb119d3f0945f2194d400b7f186df92bbb25567 (diff) | |
am 1cb119d3: am 71ba4e46: Merge "Unbreak obtaining symmetric keys from AndroidKeyStore."
* commit '1cb119d3f0945f2194d400b7f186df92bbb25567':
Unbreak obtaining symmetric keys from AndroidKeyStore.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions