diff options
author | Kenny Root <kroot@google.com> | 2017-05-05 21:00:38 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-05-05 21:00:40 +0000 |
commit | c497348c7441598fc81aa12fd15ee3fd208fbe63 (patch) | |
tree | d860a72d7f548c32f309c1392a2fd18781f8f865 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 057c7c3164d49845ccd8a9950750bbba9f1ee0f7 (diff) | |
parent | 91abf9f6e2c60b05377b2b82ea2a09fc25476e56 (diff) |
Merge changes from topic 'update-conscrypt'
* changes:
Delete obsolete and unused KeyStoreTests
Track updates to Conscrypt
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions