Merge branch 'master' into develop

[pub/Android/ownCloud.git] / owncloud-android-library

diff --git a/owncloud-android-library b/owncloud-android-library
index 2b2fc91..ff85ff2 160000 (submodule)
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@ -1 +1 @@
-Subproject commit 2b2fc9171f2cf2c4701a74e4a564148584aab33a
+Subproject commit ff85ff2eef6d418de75ab587ad9b7489d868a22a