tree 2eee9f61592e34b887a4222bcc5f11bdc5f3632b
parent 04f5233cb7eb425f66bd9d30b9d66bc737521618
parent d3f4f14218049bde7f5c5061f560c2554c6f6a0d
author Peng Xu <pengxu@google.com> 1493863816 +0000
committer android-build-merger <android-build-merger@google.com> 1493863816 +0000

Merge "Move default multihal configuration file to /vendor/..." into oc-dev
am: d3f4f14218

Change-Id: I569ec7b877e88b7a119ea22485cdfe59ab12573f