Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
authormasensio <masensio@solidgear.es>
Thu, 13 Mar 2014 14:49:17 +0000 (15:49 +0100)
committermasensio <masensio@solidgear.es>
Thu, 13 Mar 2014 14:49:17 +0000 (15:49 +0100)
commit9b2e4a6063e95090b32eea5c4a9d6f73d1187cf1
tree9a4b5ffce7e447516f26f7e112861580f7b86d93
parent7d29132af16e934b7139ff1e2a24d58b7e5bff19
parent5eccd08bc7e8783bf9908d3b861516a2e84dacbb
Merge branch 'pr/400' into improve_notifications_pr_400_with_develop
src/com/owncloud/android/syncadapter/FileSyncAdapter.java