tree 0cc18c7a6b51033a0f81e75991d2fa5d746dfb51
parent faa5bdd1efff301962537a7b271bd31c78ec13dc
author Edwin Wong <edwinwong@google.com> 1342562605 -0700
committer Edwin Wong <edwinwong@google.com> 1342563443 -0700

Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE

jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36

Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
related-to-bug: 6732061