tree b655644388cf5c474bcf08779a656e11a032400b
parent 28d4ca07c16079074237a6c2d9c424f9c76bbd8b
parent 1be8671132a7186a3ef56615ba60a1dee2c7c7c2
author Marco Nelissen <marcone@google.com> 1458337009 +0000
committer android-build-merger <android-build-merger@google.com> 1458337009 +0000

Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b  -s ours am: 501ed9d  -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3  -s ours
am: 1be8671

* commit '1be8671132a7186a3ef56615ba60a1dee2c7c7c2':
  DO NOT MERGE Verify OMX buffer sizes prior to access