diff options
| author | Selim Gurun <sgurun@google.com> | 2012-01-11 14:20:32 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-11 14:20:32 -0800 |
| commit | 0265a4a0e02db98b85bd7f9be8b866d3fb9889d2 (patch) | |
| tree | 2af83fd83e24a1e0cae98753d58ea888efe4a330 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05985a2e2ae5c21fbf69d2884c59ea475fce7f6d (diff) | |
| parent | 51938e26913a98aa8de0292e9be8ea9d9ebc67c3 (diff) | |
am 51938e26: Merge "Do Not Merge. Move ssl callbacks to webcore thread." into ics-mr1
* commit '51938e26913a98aa8de0292e9be8ea9d9ebc67c3':
Do Not Merge. Move ssl callbacks to webcore thread.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions