OSDN Git Service

am aecc1998: (-s ours) Reconcile with jb-mr2-release - do not merge
-rw-r--r-- 1800 Android.mk
-rw-r--r-- 22182 AndroidManifest.xml
-rw-r--r-- 2723 CleanSpec.mk
drwxr-xr-x - gallerycommon
drwxr-xr-x - jni
drwxr-xr-x - jni_mosaic
drwxr-xr-x - perftests
-rw-r--r-- 2802 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - src_pd
drwxr-xr-x - tests
drwxr-xr-x - tests_camera