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