Merge two-way synch changes with synch-service refactoring for SSL warning
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 25 Oct 2012 08:41:24 +0000 (10:41 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 25 Oct 2012 08:41:24 +0000 (10:41 +0200)
commitd5a327c342b97ad4a7234fdbb533682f171c8716
tree0babda62c13ce31405badacf02be6cd728185f0f
parentd25af7eea587e0112d3baeac6faf3c8321439aae
parent4ee94ba0f17d60fd0bc7470cea9c26e27d71f803
Merge two-way synch changes with synch-service refactoring for SSL warning
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/syncadapter/FileSyncAdapter.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java