OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 21 Sep 2016 04:58:42 +0000 (12:58 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 21 Sep 2016 04:58:42 +0000 (12:58 +0800)
commit482ca5530c9ec2edc968b3d847806b9f37b5bef3
treef2545fe553f98e47924b5bcc5d24a756c11b123e
parentef1c73fa9195d3f568627bea1ec4355354e04898
parenta21141c0b56148d98f42356d9b07a5cdb8126e20
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
BoardConfig.mk
packages.mk
BoardConfig.mk
nativebridge/bin/enable_nativebridge
packages.mk