From 5f79d8282d593daec7071765f7ca60a24a4ad3c5 Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Mon, 1 Jun 2015 16:51:11 -0700
Subject: [PATCH] Add accidentally deleted strings.

Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93
---
 core/res/AndroidManifest.xml    |  4 +---
 core/res/res/values/strings.xml | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 1b77bfb5672d0..c7753654d2307 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1331,7 +1331,6 @@
     <!-- @hide Allows an application to set the profile owners and the device owner.
          This permission is not available to third party applications.-->
     <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="signature"
         android:label="@string/permlab_manageProfileAndDeviceOwners"
         android:description="@string/permdesc_manageProfileAndDeviceOwners" />
@@ -2433,8 +2432,7 @@
     <!-- Allows receiving status updates from a device initializer.
          @hide Not for use by third-party applications. -->
     <permission android:name="android.permission.RECEIVE_DEVICE_INITIALIZER_STATUS"
-                android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-                android:protectionLevel="signature" />
+        android:protectionLevel="signature" />
 
     <!-- The system process that is allowed to bind to services in carrier apps will
          have this permission. Carrier apps should use this permission to protect
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index d9801efc6fafc..eab9f5f2072ce 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -668,7 +668,26 @@
       messages. This means the app could monitor or delete messages sent to your
       device without showing them to you.</string>
 
-     <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permlab_readCellBroadcasts">read cell broadcast messages</string>
+    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permdesc_readCellBroadcasts">Allows the app to read
+        cell broadcast messages received by your device. Cell broadcast alerts
+        are delivered in some locations to warn you of emergency situations.
+        Malicious apps may interfere with the performance or operation of your
+        device when an emergency cell broadcast is received.</string>
+
+    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permgrouplab_accounts">Your accounts</string>
+    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permgroupdesc_accounts">Access the available accounts.</string>
+
+    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permlab_subscribedFeedsRead">read subscribed feeds</string>
+    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+    <string name="permdesc_subscribedFeedsRead">Allows the app to get details about the currently synced feeds.</string>
+
+    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permlab_sendSms">send SMS messages</string>
     <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
     <string name="permdesc_sendSms">Allows the app to send SMS messages.