tree 92a96110ffe39c1785f4710ab9fff5f15d4c5545
parent 2ce937ef077c73cb06f19a3b3a90cc0fce5f946d
parent 84f6d11a4a97c07e2af2bad23101f16c4815b0b9
author Marco Nelissen <marcone@google.com> 1483979092 +0000
committer android-build-merger <android-build-merger@google.com> 1483979092 +0000

Merge "Decoder: Fix in MB count in MBAff error handling" into mnc-dev am: d1ebbd7139 am: 2d98342fe7 am: 87b1aa95e4 am: 24f6497bf3
am: 84f6d11a4a

Change-Id: Ice1ea32838aa7e112b743518e260499ed064264f