Change-Id: Ic492d8224e3a4c0db9f4039f1aa9cd7f13861ad6
Conflicts:
cm.xml
<project path="external/bluetooth/glib" name="platform/external/bluetooth/glib" remote="x86" revision="marshmallow-x86" />
<project path="external/bluetooth/sbc" name="platform/external/bluetooth/sbc" remote="x86" revision="marshmallow-x86" />
<project path="external/busybox" name="platform/external/busybox" remote="x86" revision="marshmallow-x86" />
- <project path="external/drm_gralloc" name="platform/hardware/drm_gralloc" remote="x86" revision="marshmallow-x86" />
+ <project path="external/drm_gralloc" name="platform/external/drm_gralloc" remote="x86" revision="marshmallow-x86" />
<project path="external/drm_hwcomposer" name="platform/external/drm_hwcomposer" groups="drm_hwcomposer" remote="x86" revision="marshmallow-x86" />
<project path="external/googleanalytics" name="platform/external/googleanalytics" remote="x86" revision="marshmallow-x86" />
<project path="external/libpciaccess" name="platform/external/libpciaccess" remote="x86" revision="marshmallow-x86" />