diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:25:14 -0700 |
| commit | fb47487259f0d5329d0fdbdecfc56baab9b96817 (patch) | |
| tree | 2a6292a6e900af0da1f7cdea799bc44404a9ece2 /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4 (diff) | |
| parent | b04f356d86eec74217fca8e3b85d801c4fcaa678 (diff) | |
am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp
* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions