OSDN Git Service

am abb8a9ac: am e8d26685: resolved conflicts for merge of da3b21c3 to eclair-mr2
-rw-r--r-- 199 Android.mk
-rw-r--r-- 5324 AndroidManifest.xml
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - assets
drwxr-xr-x - res
drwxr-xr-x - src