Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-03-24 10:08:07 +01:00
commit b5fbd3d131

View file

@ -37,7 +37,7 @@
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="com.sec.feature.spen_usp" android:required="true"/>
<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
@ -303,4 +303,4 @@
android:label="@string/osm_live"/>
<receiver android:name="net.osmand.plus.liveupdates.LiveUpdatesAlarmReceiver"/>
</application>
</manifest>
</manifest>