tree 9012536dcc279186bb0014559404e3e785a6cc9c
parent 304fca82550c306142483c02a86e48c840f77f43
parent cbc0d3ac143082dffaaf03b317b012590abbfbbb
author Wonsik Kim <wonsik@google.com> 1460956043 +0000
committer android-build-merger <android-build-merger@google.com> 1460956043 +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

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

Change-Id: Idae0950623cf27c2344d95754402c3cdbb9261ed