tree 0e26399ba2dd1da416a61724eb1bee2b0914e470
parent 2610d631513bbe32ee0285f233c89d833311882a
parent ad5994985d3426a774cb3d0ac782b53129ba3fad
author Wonsik Kim <wonsik@google.com> 1460956576 +0000
committer android-build-merger <android-build-merger@google.com> 1460956576 +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

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

Change-Id: I0e844b3de5a3c292a5f3bd148d6df2694cf67b91