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