From: Jorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Date: Mon, 24 Nov 2014 11:57:02 +0000 (+0100)
Subject: Merge branch 'gradleWithInternalDependency' into us4_view_text_files
X-Git-Tag: oc-android-1.8~17^2~8^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/10a12fb96085121482a500c55cd4784cd8970088?hp=10a12fb96085121482a500c55cd4784cd8970088

Merge branch 'gradleWithInternalDependency' into us4_view_text_files

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
---