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)
1  2 
src/com/owncloud/android/datamodel/FileDataStorageManager.java