diff options
| author | Jeff Hamilton <jham@android.com> | 2010-10-28 14:07:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-28 14:07:27 -0700 |
| commit | da8b02f77cc4df1d0cfc4127687404bafa031991 (patch) | |
| tree | bad1853da59d50bf71bf683057dea7aa0d7703a5 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 858b93c0fd24f9ee5158247e1deedaf8b239a941 (diff) | |
| parent | ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6 (diff) | |
am ae5ace55: (-s ours) am bd8ff5b5: Merge "DO NOT MERGE. Fix asset file descriptor for pipe based fds." into gingerbread
* commit 'ae5ace55d9fc45bc11608c9fb59c9ee884fd9ea6':
DO NOT MERGE. Fix asset file descriptor for pipe based fds.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions