tree d11c4ad0c70dafac059cf62ac00387ebd8c992b3
parent d7e25930834f238bbc80551670d4e47f6c337fe5
parent 7fe9a728e8c80faa4a92f6da585ee6f6a41473f0
author Wonsik Kim <wonsik@google.com> 1461012637 +0000
committer android-build-merger <android-build-merger@google.com> 1461012637 +0000

Merge "DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec" into klp-dev am: 7cab953 am: f249b0f am: 9345299  -s ours am: cbc0d3a  -s ours am: ece67a9 am: ad59949 am: fa64a21  -s ours am: 3b1a435 am: 5ffd5fe am: fbab2e6
am: 7fe9a72  -s ours

* commit '7fe9a728e8c80faa4a92f6da585ee6f6a41473f0':
  DO NOT MERGE codecs: check OMX buffer size before use in (gsm|g711)dec

Change-Id: Ib2d92942eaa7b0349d1fb436302f12a799915c72