Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 30 Sep 2013 11:49:50 +0000 (13:49 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 30 Sep 2013 11:49:50 +0000 (13:49 +0200)
commit01a4676beb60c24a0f7aeb85624200fee4b6b6a5
tree018cc2416f8e34d7a878a83467a0d8ab18577742
parentef78e58fed96c8918de0688d5b0efc3fc2b40e82
parent8b137845223cbcce7a16ac10ec8a2b88908bc5fa
Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java