tree 135356292f21561ad4fe8ce5a2ec8d4bed2e2e6c
parent e576086224f6e630159eaeec59ab5146c8533dc7
parent 04d2804a212c2625425cb23b2b778ab4f3683769
author Chong Zhang <chz@google.com> 1423181212 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423181212 +0000

am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev

* commit '04d2804a212c2625425cb23b2b778ab4f3683769':
  reuse CCDecoder on video discontinuity