summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-15 18:24:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 18:24:56 -0700
commit30550ba7a19372daa7424710ca1367bb7299e459 (patch)
tree87b3131d309faba7e3a4befb63d6968679661133 /media/libmedia
parentd804a1a27b42541157fddf725593d4e2ccaa6ad5 (diff)
parentb10d28f233bb881cc12260c320892e5feb198e9a (diff)
downloadframeworks_av-30550ba7a19372daa7424710ca1367bb7299e459.zip
frameworks_av-30550ba7a19372daa7424710ca1367bb7299e459.tar.gz
frameworks_av-30550ba7a19372daa7424710ca1367bb7299e459.tar.bz2
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 'media/libmedia')
0 files changed, 0 insertions, 0 deletions