tree eccaa2c3e40f98b69538ca69eb68d0c18da05804
parent affa3e17eb806ff55f0d3faacebca1a7feac5bb8
parent 6d58d90b0064c93cfb6b6f89c696cc53719ad831
author Android Chromium Automerger <chromium-automerger@android> 1412732912 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1412732912 +0000

Merge third_party/openmax_dl from https://chromium.googlesource.com/external/webrtc/deps/third_party/openmax.git at 6d58d90b0064c93cfb6b6f89c696cc53719ad831

This commit was generated by merge_from_chromium.py.

Change-Id: I39019855640fd351dbb66e6d812eb7338230cef5