Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 17 Nov 2014 12:36:26 +0000 (13:36 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Mon, 17 Nov 2014 12:36:26 +0000 (13:36 +0100)
commit9bfacf23cbcdbcdd79157bef18006487e7b59c0c
treea0f6f6c769cce6080cd227e4f0466d891e179aa6
parentbade3b9f6c717033725f75d743a59dd020429c0e
parent3f5b3f0d1dee9eee839a24bc63d7bce610fce1d6
Merge remote-tracking branch 'upstream/develop' into gradleWithInternalDependency
src/com/owncloud/android/datamodel/FileDataStorageManager.java