OSDN Git Service

Merge remote-tracking branch 'x86/kitkat-x86' into lollipop-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 29 Apr 2015 16:12:09 +0000 (00:12 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 29 Apr 2015 16:12:09 +0000 (00:12 +0800)
1  2 
Android.mk

diff --cc Android.mk
Simple merge