tree 2abe8fac26ff4383bbe25f9ee6e490aa1b752fdf
parent 468204124e95bbf74ae8cc000318ade29e311be6
parent b8814dce287552c1bdf13fa999296ebc7387776d
author Andreas Huber <andih@google.com> 1282767237 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282767237 -0700

am b8814dce: Merge "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." into gingerbread

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.