Merge branch 'gradleWithInternalDependency' into us4_view_text_files
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 24 Nov 2014 11:57:02 +0000 (12:57 +0100)
commit10a12fb96085121482a500c55cd4784cd8970088
tree77a154f30a9d759078d54e198fbf5e7624ffc4e2
parentda2702129f6deefb66310ebe2da2ef73e664682d
parentcb37a11b445b516a3211c664108e89c6b8c73bfb
Merge branch 'gradleWithInternalDependency' into us4_view_text_files

Conflicts:
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
.idea/misc.xml
.idea/modules.xml
android.iml
src/com/owncloud/android/ui/activity/FileDisplayActivity.java