OSDN Git Service

Merge "resolved conflicts for merge of 2a612605 to master"
-rw-r--r-- 368 Android.mk
-rw-r--r-- 42375 AndroidManifest.xml
-rw-r--r-- 2227 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - assets
-rw-r--r-- 289 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests