tree 7493a758e3dd8958540ed42438fa059fb89a8083
parent a92d05fc1ec048541d888c4ef72ee63617ee18f1
parent e2424e989525f332bce80191d5316594b2a08a61
author Venkatarama Avadhani <venkatarama.avadhani@ittiam.com> 1497666717 +0000
committer android-build-merger <android-build-merger@google.com> 1497666717 +0000

Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9 am: 0817640c9f am: 41c60ea30e
am: e2424e9895  -s ours

Change-Id: I2872c2aa5257d0828e1d6c6176844b9827a9f3a4