Merge branch 'master' of github.com:siacs/Conversations
This commit is contained in:
commit
d4a05b8ef3
|
@ -32,7 +32,9 @@
|
||||||
android:icon="@drawable/ic_launcher"
|
android:icon="@drawable/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:theme="@style/ConversationsTheme"
|
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"
|
<meta-data android:name="com.google.android.gms.car.application"
|
||||||
android:resource="@xml/automotive_app_desc" />
|
android:resource="@xml/automotive_app_desc" />
|
||||||
|
|
Loading…
Reference in a new issue