diff options
| author | Shawn Willden <swillden@google.com> | 2015-03-19 00:27:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-19 00:27:38 +0000 |
| commit | 254c58c4e760e0af132d680fbd783a38ef436435 (patch) | |
| tree | 89460604c791c3a50e24ccf920cb6b2a68bb83b7 /rs/java/android/renderscript/RenderScript.java | |
| parent | 437ac8f8445b078041171eff56ce7ffbd1cf6766 (diff) | |
| parent | fe2b1a82989e20504bd934c67eb621ac0dcdb5e0 (diff) | |
Merge changes Id9a22ad3,I629ab2c4
* changes:
Add KM_TAG_AUTH_TOKEN.
Add support for KM_TAG_USER_SECURE_ID.
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions