tree af8f789b069e2cdadee8f427734b553f55c1ceb1
parent 6c5e30f60c21f94bd0a8c9f815a5aa4366ac8e8a
parent 03beb7d3149ae2f5c37ee73e43ad443b1c36c948
author Harish Mahendrakar <harish.mahendrakar@ittiam.com> 1523413802 -0700
committer android-build-merger <android-build-merger@google.com> 1523413802 -0700

[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in reInitDecoder() skipped: 169e6aca16 skipped: 2a2076c019 skipped: 5573b5a432 skipped: 0de6c45885 skipped: fd2fa97ba1 skipped: 9461f8a7e2 skipped: d861134df9 skipped: e400c03497 skipped: cef6223617
am: 03beb7d314

Change-Id: Iae99f5af9ffcd2cfd2e9e48c16b79229437e3f12