Merge branch 'develop' into loging_different_servers_same_pattern
[pub/Android/ownCloud.git] / res / layout-v11 /
drwxr-xr-x   ..
-rw-r--r-- 2032 activity_row.xml
-rw-r--r-- 2797 notification_with_progress_bar.xml