diff options
| author | Alex Klyubin <klyubin@google.com> | 2014-03-24 17:34:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 17:34:11 +0000 |
| commit | f96bfe86a68bfd0491a76cf6dfa515dc58f027bb (patch) | |
| tree | 8f9c106be2c373da550dc247797e446a13936e80 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6640f6be412e7454bfa7d457670e83aba46ea28c (diff) | |
| parent | 7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3 (diff) | |
am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."
* commit '7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3':
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