diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-09-15 11:36:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:36:58 -0700 |
| commit | 7352c8bb4242caeba47e7696541c133760cc95de (patch) | |
| tree | 1735bcc8314f711822ce8d06c7fa70054fc29cb6 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d0fa371f276fde32d81c037006941bc93da0bb03 (diff) | |
| parent | 0535d8577fb2a3687428f462c591ae3220e1f773 (diff) | |
am 0535d857: am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '0535d8577fb2a3687428f462c591ae3220e1f773'
* commit '0535d8577fb2a3687428f462c591ae3220e1f773':
Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions