tree 4d430afb6b88e0acdf59642f88b6d3167aa0885e
parent 1be7e75083f9ade3a6373f696a79bf1d21837f6b
parent 6524dbd5083c4275fbbd029df9857404a27b784a
author Wonsik Kim <wonsik@google.com> 1460078943 +0000
committer android-build-merger <android-build-merger@google.com> 1460078943 +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 am: 525822a  -s ours
am: 6524dbd

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

Change-Id: I5a8099c3a44821307981a84b7552873b6d463f02