OSDN Git Service

resolved conflicts for merge of c0715fd5 to master
[android-x86/packages-apps-Gallery2.git] / gallerycommon /
drwxr-xr-x   ..
-rw-r--r-- 1039 Android.mk
drwxr-xr-x - src