tree 7040264d2659e2323cb3ad54d80a042b6d2e75d9
parent c83fc3e1020b26fc36e6a9cd1cdc352ee0374069
parent 0756aa99dffd5740d963fdda60699fdefe58ce85
author Andreas Huber <andih@google.com> 1335470608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335470608 -0700

am 0756aa99: Merge "NuMediaExtractor API to unselect tracks and finer control over seeking." into jb-dev

* commit '0756aa99dffd5740d963fdda60699fdefe58ce85':
  NuMediaExtractor API to unselect tracks and finer control over seeking.