summaryrefslogtreecommitdiffstats
path: root/native/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-15 08:32:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-15 08:32:06 -0700
commit4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02 (patch)
treec667af4181a0213610fc2ee53d39b3b0aacd3d0a /native/include
parentd609279c33f7d5587e5fa0bd954bff846623e246 (diff)
parentbb5d7c21615128630fc9d08274bb14ca01e2124b (diff)
downloadframeworks_base-4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02.zip
frameworks_base-4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02.tar.gz
frameworks_base-4bd4bd6fc05ab7108f4f59f98bd6b595cec58e02.tar.bz2
am bb5d7c21: am 5f423917: Merge "Attempt to derive the avg. bitrate of the entire stream from metadata." into gingerbread
Merge commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b' * commit 'bb5d7c21615128630fc9d08274bb14ca01e2124b': Attempt to derive the avg. bitrate of the entire stream from metadata.
Diffstat (limited to 'native/include')
0 files changed, 0 insertions, 0 deletions