OSDN Git Service

am 0e106a80: am f4a785b4: resolved conflicts for merge of dce90517 to eclair-mr2
-rw-r--r-- 159 Android.mk
-rw-r--r-- 4915 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