Merge remote-tracking branch 'origin/operations_service' into operations_service
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 28 Mar 2014 11:57:44 +0000 (12:57 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 28 Mar 2014 11:57:44 +0000 (12:57 +0100)
commit7c4fc0486ffedcbbc35050d285570a4563befb2d
treeb52f39e8c4acda463c36233405d99b8e69cd7432
parent565875d7536a38de93eb30dd60733f01b231beda
parentf991e1e91dce62fbf4b04c9687010a022b09e125
Merge remote-tracking branch 'origin/operations_service' into operations_service
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/services/OperationsService.java