OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2091772
62c6ce2
)
am b8814dce: Merge "Allow sniffers to return a packet of opaque data that the corresp...
author
Andreas Huber
<andih@google.com>
Wed, 25 Aug 2010 20:13:57 +0000
(13:13 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 25 Aug 2010 20:13:57 +0000
(13:13 -0700)
Merge commit '
b8814dce287552c1bdf13fa999296ebc7387776d
' into gingerbread-plus-aosp
* commit '
b8814dce287552c1bdf13fa999296ebc7387776d
':
Allow sniffers to return a packet of opaque data that the corresponding extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now.
Trivial merge