tree cba185cca162dc72ce4024c868abcfe85f4c36c5
parent a55b5dd44f2fd4719c7a2dd5e653047686424083
parent 16aecc3c2390439651cc01c8a9568123122e84ed
author Ritu Baldwa <ritu.baldwa@ittiam.com> 1507072529 +0000
committer android-build-merger <android-build-merger@google.com> 1507072529 +0000

Merge "DO NOT MERGE Decoder: Modified setting of error code in set flush api." into mnc-dev am: 6a09a35355  -s ours am: b288f51729  -s ours am: 458c4a866c  -s ours am: e8235bbcea  -s ours am: 23d505806b  -s ours am: d570b32872  -s ours am: 82e6cbe7e2  -s ours
am: 16aecc3c23  -s ours

Change-Id: I8488f11dc27212fb3ad6cb9f8bab9e64e3b8fd1f