OSDN Git Service

Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 6 Feb 2016 06:04:34 +0000 (14:04 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 6 Feb 2016 06:04:34 +0000 (14:04 +0800)
commitbbd56c3b7fe0684e68d81887848516a12d1195f7
tree78188fd06e17619c6b2a3a06f4630fcc4de70748
parent84732737cf5399580b8a8642be0bc9428fb2cddc
parent2796e618bea4b351254e92cd0fc968bd5992389f
Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86

Conflicts:
initrd/scripts/0-auto-detect
Android.mk
initrd/scripts/0-auto-detect
install/scripts/1-install