tree e76d97f3cb79cfcd97481d124d8deaa0e657a7d6
parent 00f74b63ce12083d3a96f2fa43b36463d968cee4
parent 59244b5bdeefac4bb23d60122d041c2c8c380d2c
author Rakesh Kumar <rakesh.kumar@ittiam.com> 1569471766 -0700
committer android-build-merger <android-build-merger@google.com> 1569471766 -0700

Merge "NdkMediaCodec: Wrong check in error callback handler" am: 49a4f52e02 am: 8155143547 am: a001e57f7d
am: 59244b5bde

Change-Id: I263b72b11799b446a29b0bb63e5d5ba523a3fc0c