tree 109e2e8a7e4984eea887d6261b9aad9d46e9d6f5
parent 7e217db163197b9a72f9147a57c3bc635896d382
parent d3e0de0d55027eeb2744d464a6ad0cdb7d47f826
author Wonsik Kim <wonsik@google.com> 1460078460 +0000
committer android-build-merger <android-build-merger@google.com> 1460078460 +0000

Merge "DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec" into klp-dev am: f81eab3 am: eec4dd5
am: d3e0de0  -s ours

* commit 'd3e0de0d55027eeb2744d464a6ad0cdb7d47f826':
  DO NOT MERGE codecs: check OMX buffer size before use in (h263|h264)dec

Change-Id: I0a9e8410a11b4139298371c04ce7f161f3dce158