Merge branch 'master' of github.com:siacs/Conversations

This commit is contained in:
Daniel Gultsch 2018-03-14 08:22:18 +01:00
commit d4a05b8ef3

View file

@ -32,7 +32,9 @@
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/ConversationsTheme"
tools:replace="android:label">
android:appCategory="social"
tools:replace="android:label"
tools:targetApi="o">
<meta-data android:name="com.google.android.gms.car.application"
android:resource="@xml/automotive_app_desc" />