commit 24993b6cd4c5b0cf3724c3fb7835a5482478a090
author Xin Li <delphij@google.com> Mon Feb 25 01:33:57 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Feb 25 01:33:57 2019 -0800
tree 772ad4d717fc8033d22731eedea7b91b58719128
parent 4d56e91bbf0cb222a07209e323f0858eafc45855
parent 93f043db4233c02ca1900f2b7eff9879934ba794

Merge stage-aosp-master into pi-dev-plus-aosp
am: 93f043db42

Change-Id: Ib754afeec7d93105074a9db7149aa13a84cd4c42

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6076e9b..d303ba5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,11 +20,11 @@
           coreApp="true"
           android:sharedUserId="android.uid.phone">
 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.READ_SMS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.READ_SMS" />
     <uses-permission android:name="android.permission.WRITE_SMS"/>
     <uses-permission android:name="android.permission.BROADCAST_WAP_PUSH"/>
-    <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES" />
+    <uses-permission android:name="android.permission.BIND_CARRIER_SERVICES"/>
     <!-- BIND_CARRIER_MESSAGING_SERVICE has been deprecated in favor of BIND_CARRIER_SERVICES. -->
     <uses-permission android:name="android.permission.BIND_CARRIER_MESSAGING_SERVICE"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>