tree 82f5e1f25bf0726267e036df42d5f2d38131767b
parent a9f7478f956d577da0c15172a712185460d3b1ce
parent 92a3c3d75d1bd6c3af4372fc2f18e19a5fcd6da3
author Yifan Hong <elsk@google.com> 1494284122 +0000
committer android-build-merger <android-build-merger@google.com> 1494284122 +0000

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

Change-Id: I9f2f988465253d16cb8d2881991893d3e42be6d5