OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d01002e 2f7b9bf)
am 8fb7bd4d: am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Aug 2011 21:12:43 +0000 (14:12 -0700)
* commit '8fb7bd4d02cd4ad2111699778e64464d979f03bb':
  Stagefright: Return error if codec takes too long to return a buffer.


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