OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42be744 3f5b286)
am 3f5b2867: Merge change I8f658214 into eclair-mr2
authorAndreas Huber <andih@google.com>
Wed, 9 Dec 2009 23:46:23 +0000 (15:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 9 Dec 2009 23:46:23 +0000 (15:46 -0800)
Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp

* commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc':
  Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help