OSDN Git Service

Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 17 Jan 2016 19:03:33 +0000 (03:03 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sun, 17 Jan 2016 19:03:33 +0000 (03:03 +0800)
commitfad9b7ee417ff345dd2de772aef40095928d8a8d
tree7bc6451f798946dbea32d981c6a5c69571dda891
parenteeb7464e3fb0d0e014b77549105e03baaf6fcefd
parentb06644aeb179f3e8b1a67e51cd91e4d7b7cd2949
Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86

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