OSDN Git Service

Merge remote-tracking branch 'x86/kitkat-x86' into marshmallow-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 23 Jan 2016 12:13:44 +0000 (20:13 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Sat, 23 Jan 2016 12:13:44 +0000 (20:13 +0800)
1  2 
Android.mk

diff --cc Android.mk
Simple merge