| commit | add3dfc488c8f21cd7a9c95cefeb1d2937d07e51 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Oct 23 15:11:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 23 15:11:29 2012 -0700 |
| tree | c5c715efabe7a5a26e6b4227b73d1f63d59722f3 | |
| parent | 07fd6c218a47ef3250d1b56b932a6877f9efacfc [diff] | |
| parent | 93a209fe6ee0c7251afe47153f6af5ad38b8dde9 [diff] |
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.