OSDN Git Service

(root) / android-x86 / device-generic-common.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7162cb1 9d98165)
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)
Conflicts:
BoardConfig.mk

1  2 
BoardConfig.mk patch | diff1 | diff2 | blob | history

diff --cc BoardConfig.mk
Simple merge
device/generic/common
About OSDN
Find Software
Develop Software
Help