tree 74693484faeceb358a96ef8d2d8a9a6fbb1e95f7
parent 53daa4e90ce1d3df16bf96472e1c17b5a3264328
parent d6b29883ff278067efef27624bfe7807c759438e
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1517554752 +0000
committer android-build-merger <android-build-merger@google.com> 1517554752 +0000

[automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a
am: d6b29883ff

Change-Id: I1432c9e013fae8ec830ea44d094d63174dde4785