From: Peter Henn <Peter.Henn@web.de>
Date: Sat, 3 Oct 2015 10:03:37 +0000 (+0000)
Subject: Merge tag 'oc-android-1.8' into sdcard-save
X-Git-Tag: sd-android-1.8
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bbfcb04a9947d0076dff20bb57d2944b85d6dc65?hp=bbfcb04a9947d0076dff20bb57d2944b85d6dc65

Merge tag 'oc-android-1.8' into sdcard-save

Version 1.8: Includes Material Design
Resolved conflicts in:
src/com/owncloud/android/utils/FileStorageUtils.java
---