Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
[pub/Android/ownCloud.git] / res / values / attrs.xml
2012-05-01 Bartek Przybylskiinitial commit of editbox with badge