Merge "Do not override odlparent properties."
[vpnservice.git] / vpnmanager / vpnmanager-impl / src / main / config /
drwxr-xr-x   ..
-rw-r--r-- 1708 default-config.xml