OSDN Git Service

am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to...
-rw-r--r-- 479 Android.mk
-rw-r--r-- 82268 AndroidManifest.xml
-rw-r--r-- 2227 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
-rw-r--r-- 793 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests