summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrwbenc/inc/acelp.h
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2011-06-28 18:55:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-28 18:55:42 -0700
commit9bce27a9ce916bdf363667ee67fc0ce50c533aa3 (patch)
tree1946628579b2bd45a0ba2b48440151a2ba68d7df /media/libstagefright/codecs/amrwbenc/inc/acelp.h
parent155cf6c1e191bb03fe24db8663715862d8e6a43d (diff)
parent4753498d5c1ac3cf93b0730e77946a95b6913a82 (diff)
downloadframeworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.zip
frameworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.tar.gz
frameworks_base-9bce27a9ce916bdf363667ee67fc0ce50c533aa3.tar.bz2
am 4753498d: Merge "CherryPick 06942bc4 from hc-mr1. do not merge." into gingerbread
* commit '4753498d5c1ac3cf93b0730e77946a95b6913a82': CherryPick 06942bc4 from hc-mr1. do not merge.
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc/inc/acelp.h')
0 files changed, 0 insertions, 0 deletions