Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text...
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 25 Nov 2014 20:51:26 +0000 (21:51 +0100)
commit45fd60d3e52a19562016ba35a76d852cea48f558
tree55234b06d8d3c4bcf4941b49cb6c768ea255375a
parent10a12fb96085121482a500c55cd4784cd8970088
parent9764f939f50b9d56d9fc55d1512d7a23d3afd714
Merge remote-tracking branch 'origin/gradleWithInternalDependency' into us4_view_text_files

Conflicts:
.idea/misc.xml
.idea/modules.xml
android.iml