Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-01 12:30:06 +02:00
commit 4d755a7180

View file

@ -25,8 +25,8 @@
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<!-- The next 2 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-permission android:name="android.permission.BROADCAST_STICKY" android:maxSdkVersion="18" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="18" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />