Merge branch 'develop' into fix_instant_uploads_in_Samsung_4.x_devices
[pub/Android/ownCloud.git] / tests / res / values /
2012-09-29 Bartek Przybylskijunit for android app