OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE" am: 25a33ce5e7 -s ours am: f64e2c9d7a...
-rw-r--r-- 130 .gitignore
-rw-r--r-- 1243 Android.mk
-rw-r--r-- 7433 AndroidManifest.xml
-rw-r--r-- 2228 CleanSpec.mk
drwxr-xr-x - assets
drwxr-xr-x - jni
-rw-r--r-- 781 proguard-project.txt
-rw-r--r-- 1495 proguard.flags
-rw-r--r-- 563 project.properties
drwxr-xr-x - res
drwxr-xr-x - res_p
drwxr-xr-x - src
drwxr-xr-x - src_pd
drwxr-xr-x - src_pd_gcam
drwxr-xr-x - tests
-rw-r--r-- 3667 version.mk