tree c5c715efabe7a5a26e6b4227b73d1f63d59722f3
parent 07fd6c218a47ef3250d1b56b932a6877f9efacfc
parent 93a209fe6ee0c7251afe47153f6af5ad38b8dde9
author Andreas Huber <andih@google.com> 1351030289 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351030289 -0700

am ac1a450a: Merge "Don\'t attempt to seek audio and video separately." into jb-mr1-dev

* commit 'ac1a450a76c2f42f66c876200cb724d1e93ef4c7':
  Don't attempt to seek audio and video separately.