tree c6aee49ca82ca6942d5933a38e688ae723b46bcd
parent 5a26569fa398609c017249e3e93a3384be867208
parent 43a184ad481e2346f03f1398af74c04a3bb46e4d
author Ray Essick <essick@google.com> 1484773872 +0000
committer android-build-merger <android-build-merger@google.com> 1484773872 +0000

Merge "Decoder: Initialize ps_cur_slice->u1_mbaff_frame_flag correctly for error cases" into mnc-dev
am: 43a184ad48

Change-Id: I8886826d4c30c0dbfe0ace25ca87cca3fa015c7e