Merge remote-tracking branch 'origin/master' into cancel_in_upload
[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog /
drwxr-xr-x   ..
-rw-r--r-- 7581 SslValidatorDialog.java