diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:24:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:24:56 -0700 |
| commit | 746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4 (patch) | |
| tree | 3512a5af553e8791f0f46f3142d7dabc3ffb449e /graphics/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13e46665ff69c1a37880762d7d611aacdf02dac7 (diff) | |
| parent | ff7a7a455c15077e2b691efa370619f06058f697 (diff) | |
am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp
* commit 'ff7a7a455c15077e2b691efa370619f06058f697':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions