OSDN Git Service

resolve merge conflicts of 56a2b529373b to nyc-dev
[android-x86/frameworks-base.git] / packages / VpnDialogs /
drwxr-xr-x   ..
-rw-r--r-- 866 Android.mk
-rw-r--r-- 1768 AndroidManifest.xml
drwxr-xr-x - res
drwxr-xr-x - src