OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
45923cd
0581cb2
)
am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error...
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 1 Aug 2011 21:10:39 +0000
(14:10 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 1 Aug 2011 21:10:39 +0000
(14:10 -0700)
* commit '
5bb3129c7eabce34d7c1469826e1795d4b225bb3
':
Stagefright: Return error if codec takes too long to return a buffer.
Trivial merge