OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 27 Sep 2016 14:15:21 +0000 (22:15 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Tue, 27 Sep 2016 14:15:21 +0000 (22:15 +0800)
commit10b4df8bfde7aee0c1c91ed3cf6c4025f52e2a64
tree51ed80eac9b08bfe6a5e19a3b613d8c357a9fddd
parent7162cb1c1e0d6be13e0b02c6461e9efe031925ba
parent9d9816579c7cdcfab5338f2f07d57d0d4ea2f01b
Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86

Conflicts:
BoardConfig.mk
BoardConfig.mk