tree e08e0be37c33e86f12434b097edd536a1c58c4a9
parent 1ec856e6e0955a3cc09fb5aae920aa1b3329773b
parent c6e58419e00e6d04882a885101510e667d9c043a
author Wei Jia <wjia@google.com> 1436577370 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436577370 +0000

Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev