OSDN Git Service

resolve merge conflicts of aa9c9fb29e to nyc-dev
[android-x86/frameworks-base.git] / data / etc /
drwxr-xr-x   ..
-rw-r--r-- 1200 Android.mk
-rw-r--r-- 7355 platform.xml