summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-08-31 15:02:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-31 15:02:38 -0700
commit3ef9f98aebb76018d2ee48ae4ac727a05efa63df (patch)
tree9010dcc3240ab1607e71a51b1fb9d56aade552f1 /services
parent16c4e8c778d8518af4c0cbefadc5d5b1272c1762 (diff)
parentdc344e56790d2a301d25c27a4c0ae47cdac2898b (diff)
downloadframeworks_av-3ef9f98aebb76018d2ee48ae4ac727a05efa63df.zip
frameworks_av-3ef9f98aebb76018d2ee48ae4ac727a05efa63df.tar.gz
frameworks_av-3ef9f98aebb76018d2ee48ae4ac727a05efa63df.tar.bz2
am 6b52911c: am 48ac68e1: Merge "Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr." into gingerbread
Merge commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f' * commit '6b52911cc7ba548fd3a240ca61eba510a8581e6f': Support for RFC3640 - mpeg4-generic RTP packet type, AAC-lbr and AAC-hbr.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions