diff options
author | Alex Klyubin <klyubin@google.com> | 2014-03-21 11:41:38 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 11:41:38 -0700 |
commit | d8c32164e19d16cf7d66b9aee368369ae16a4f0d (patch) | |
tree | 4bffe0ec37809688b6dfae7797cfbaf08deacab0 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | e4360c8e14d1ea362fb1d13b7a5c9bf003f3be00 (diff) | |
parent | 88517170cbb09b45324d5b457a0e5e840cc7d09b (diff) |
am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '88517170cbb09b45324d5b457a0e5e840cc7d09b':
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