Merge branch 'develop' into allow_multiline_checkbox_preferences_pr_395_with_develop
[pub/Android/ownCloud.git] / tests / proguard-project.txt
2012-09-29 Bartek Przybylskijunit for android app