diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml index eccb6cad..7836d184 100644 --- a/play-services-core/src/main/AndroidManifest.xml +++ b/play-services-core/src/main/AndroidManifest.xml @@ -51,12 +51,51 @@ android:label="@string/perm_extended_access_label" android:protectionLevel="dangerous" /> +<<<<<<< HEAD +======= + + + + + + + + + + + + + +>>>>>>> 0dab96ff (Declare car related permissions (#2208)) diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml index 81090489..b420e8a2 100755 --- a/play-services-core/src/main/res/values/strings.xml +++ b/play-services-core/src/main/res/values/strings.xml @@ -54,6 +54,18 @@ This can take a couple of minutes." View project source code on GitLab + Car speed + "Access your car's speed" + + Car information + "Access your car's information" + Car fuel level + "Access your car's fuel level information" + Car mileage + "Access your car's mileage information" + Car vendor channel + "Access your car's vendor channel to exchange car-specific information" + Google device registration Cloud Messaging