tree 10012166041113f6726a87f40f03f63c14ab16c1
parent 1b1d165d74a51789ceb46e6a1eafb9816636164d
parent 01642706d2b37cb7b9db84add870ea0fdabdf5ad
author Android Chromium Automerger <chromium-automerger@android> 1412743368 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1412743368 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I6c2674dea7cbc657c8f95cee973688b31e2dced0