Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-12 23:56:12 +02:00
commit 9c924f7771

View file

@ -24,9 +24,9 @@
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<!-- The 2 below seem necessary only for Android < v4.4 (to initialize BT SCO) (?!?) -->
<uses-permission android:name="android.permission.BROADCAST_STICKY" android:maxSdkVersion="18" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="18" />
<!-- The 2 below seem necessary only for Android < v4.2 (to initialize BT SCO) -->
<uses-permission android:name="android.permission.BROADCAST_STICKY" android:maxSdkVersion="16" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="16" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />