tree 6e9ee8947d5f95336517cc834f01da507ee824bc
parent 3ec9c3d2d813149b9f049afc5ea48f1276645f3a
parent adf34bf9b7925f990259b1b6f4c69b8668f76ead
author Andy Hung <hunga@google.com> 1409949507 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409949508 +0000

Merge "NuPlayer: Discard seeks when source and decoders are NULL" into lmp-dev