Merge branch 'material_toolbar' of https://github.com/owncloud/android into material_...
[pub/Android/ownCloud.git] / automationTest / resources /
drwxr-xr-x   ..
-rw-r--r-- 70 .gitignore