Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-12 17:55:14 +01:00
commit f6f16351d5

View file

@ -47,12 +47,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"/>
<fragment <!--<fragment-->
xmlns:android="http://schemas.android.com/apk/res/android" <!--xmlns:android="http://schemas.android.com/apk/res/android"-->
android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment" <!--android:name="net.osmand.plus.dashboard.DashDownloadMapsFragment"-->
android:layout_marginTop="@dimen/dashCardMargin" <!--android:layout_marginTop="@dimen/dashCardMargin"-->
android:layout_width="match_parent" <!--android:layout_width="match_parent"-->
android:layout_height="wrap_content"/> <!--android:layout_height="wrap_content"/>-->
<fragment <fragment
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"