am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX...
am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore." into gingerbread
Merge commit '746c6a1c'
* commit '746c6a1c':
Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.