tree 64ad387591567a3bc6a0b9658ec1492a0b11eefc
parent d46cee4a8dffd48f7dfe56795f8fd1a1caa48fdb
parent b8e84d240f439a94d481f289b17a2840786f9e15
author Yifan Hong <elsk@google.com> 1494281526 +0000
committer android-build-merger <android-build-merger@google.com> 1494281526 +0000

Merge "Revert "Set omx and configstore as optional."" into oc-dev
am: b8e84d240f

Change-Id: Iaf5f7aacacd2eb72b1ba98e19f5fe7589580bdbd