Merge remote-tracking branch 'origin/sync_review_2'
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 5 Dec 2012 22:23:10 +0000 (23:23 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 5 Dec 2012 22:23:10 +0000 (23:23 +0100)
commit279670c303c6b5e2c5a437b712e8d5ecf6f8b1a7
tree32b8535b899dc731ab4b8f1a367deb8b19a9c9d7
parent801d8922d3c40b4ca534cf545acce00baea666ae
parentabd5f51554b4eed06e98922c0fb2253c2205281c
Merge remote-tracking branch 'origin/sync_review_2'
res/values/strings.xml
src/com/owncloud/android/Uploader.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java