Merge commit 'remotes/korg/cupcake' into merge
-rw-r--r-- 603 Android.mk
-rw-r--r-- 0 MODULE_LICENSE_GPL
drwxr-xr-x - yaffs2