OSDN Git Service

resolve merge conflicts of 333ba2d to nyc-mr1-dev
[android-x86/packages-apps-Settings.git] / res / values-lo-nokeys /
drwxr-xr-x   ..
-rw-r--r-- 960 strings.xml