OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 394da77 7b783a8)
am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of encoded data into a...
authorAndreas Huber <andih@google.com>
Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Apr 2010 21:52:57 +0000 (14:52 -0700)
Merge commit '25dc5f30b2a8276c5790c7152a801fcd905c7281' into froyo-plus-aosp

* commit '25dc5f30b2a8276c5790c7152a801fcd905c7281':
  Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.


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