OSDN Git Service

(root) / android-x86 / device-generic-x86.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81ce753 475fa42)
Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86 marshmallow-x86 android-x86-6.0-r1 android-x86-6.0-r2 android-x86-6.0-r3
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 8 Oct 2015 07:31:09 +0000 (15:31 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 8 Oct 2015 07:31:09 +0000 (15:31 +0800)
commit6bbcc86e8ff71709a2b0267c03d256a778fb8d04
tree82cb8d14edf5a213aaba5701d3c0726da5c5df12tree | snapshot
parent81ce753ec0014fe404c4eec3ac6d04504356a638commit | diff
parent475fa426fc5968a8ee4318c508593055b3ca6d97commit | diff
Merge remote-tracking branch 'x86/lollipop-x86' into marshmallow-x86

Conflicts:
BoardConfig.mk
BoardConfig.mk diff1 | diff2 | blob | history
device/generic/x86
About OSDN
Find Software
Develop Software
Help