tree 340fd639cd8c487e65c47e4d44ee66974d8a9b85
parent 30550ba7a19372daa7424710ca1367bb7299e459
parent 56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627
author Andreas Huber <andih@google.com> 1287192314 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287192314 -0700

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.