OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e82c319
972c502
)
Merge "Stagefright: Return error if codec takes too long to return a buffer."
author
Jean-Baptiste Queru
<jbq@google.com>
Mon, 1 Aug 2011 20:43:07 +0000
(13:43 -0700)
committer
Android Code Review
<code-review@android.com>
Mon, 1 Aug 2011 20:43:07 +0000
(13:43 -0700)
Trivial merge