Merge remote-tracking branch 'origin/operations_service' into operations_service
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Apr 2014 13:17:33 +0000 (15:17 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 1 Apr 2014 13:17:33 +0000 (15:17 +0200)
commite566d041d199b3a91bfcca7cda72160d7d4ddf8e
tree6fe627eec1f1a47c7e2b7a4f03ad6094865ebb4f
parent0addc90ae5082de926dc9c5bbb8092d6efe123a8
parentc2c10bcff893790e7af07c51afeb43315ff2ed84
Merge remote-tracking branch 'origin/operations_service' into operations_service
owncloud-android-library
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/services/OperationsService.java