diff options
author | Alex Klyubin <klyubin@google.com> | 2014-03-21 18:47:27 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 18:47:27 +0000 |
commit | 92ec0a0c7a568a77696964c16f4e44292c633ef1 (patch) | |
tree | 6b557439b1ed5bfa43e57165a9559d86fe498175 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | cf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2 (diff) | |
parent | d8c32164e19d16cf7d66b9aee368369ae16a4f0d (diff) |
am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
Adjust to the change in the private SSLParameterImpl API.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions