From: Jorge Antonio Diaz-Benito Soriano Date: Tue, 25 Nov 2014 20:51:26 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text... X-Git-Tag: oc-android-1.8~17^2~8^2~8 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/45fd60d3e52a19562016ba35a76d852cea48f558?hp=-c Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files Conflicts: .idea/misc.xml .idea/modules.xml android.iml --- 45fd60d3e52a19562016ba35a76d852cea48f558