tree 0a6ae535ada3abe615d451d4d67ab2011794f99b
parent 80f3b06d902e245678a7e2d1bc6ac9e73c24dfb5
parent a38d1442ee6c496a5df36117f961275728202ff0
author Marco Nelissen <marcone@google.com> 1476835541 +0000
committer android-build-merger <android-build-merger@google.com> 1476835541 +0000

Merge "Decoder: Fixes in handling errors in Mbaff clips." into mnc-dev am: 23d5bc6405 am: 1e36eb1b99 am: 48c4de0f98 am: eab553f817
am: a38d1442ee

Change-Id: Ib60f7aef890f6d166301974ce1aa907c662bbf1f