tree d4b9873b7becf73fa11979956a357102a179d72d
parent 624ce190aa24de42a0faa6c7e167f35687a5d484
parent fedb0f142b2f4c5a240c67715ec47642fef9b783
author Pawin Vongmasa <pawin@google.com> 1502208607 +0000
committer android-build-merger <android-build-merger@google.com> 1502208607 +0000

Merge "Add media/openmax as an include directory" into oc-mr1-dev am: 4af5a629c6 am: fad45d87ef am: dba34b72c4
am: fedb0f142b

Change-Id: Ib73f411712bf271f115a463edf55189f38c7bae2