[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in...

[automerger skipped] RESTRICT AUTOMERGE SoftHEVC: Handle error in reInitDecoder() skipped: 169e6aca skipped: 2a2076c0 skipped: 5573b5a4 skipped: 0de6c458 skipped: fd2fa97b skipped: 9461f8a7 skipped: d861134d skipped: e400c034 skipped: cef62236 am: 03beb7d3 am: c36e6aed am: 0e940b84  -s ours am: 94525c77
am: 0ff41d1a  -s ours

Change-Id: Iefbf8ec1e094fe7c40ec28d5c77990c72defd613