OSDN Git Service

Merge remote-tracking branch 'x86/marshmallow-x86' into cm-13.0-x86 cm-13.0-x86
-rw-r--r-- 1043 Android.mk
-rwxr-xr-x 160269 AndroidManifest.xml
-rw-r--r-- 2404 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - assets
-rw-r--r-- 1472 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests
-rwxr-xr-x 1310 wrap_alpha.py