tree e63be131e18cb7639ebbadcf6416aa6fa378335c
parent e17682a20c0baf7ab216be6b4f19998085d6da0d
parent cef6223617b2c1c841f50f96de9d08042b901de2
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1522885383 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1522885383 +0000

[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

Change-Id: I99b38d8427a4a7c96ed5f29e4049ce589675a959