summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nadia Agueeva <agueeva@google.com> 2024-02-09 22:00:13 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-02-09 22:00:13 +0000
commit034f11bb0b5f1aa9be1f6d8f6ce62bb069341729 (patch)
treeb6ec75837a02b8dd6363daab251b3e4eb8f9082e
parentc86fc47ccc6644847074d31681e89203dbfe2ea4 (diff)
parent11386e34b8bb203dee187aa908acdab0e7433f17 (diff)
Merge "Fix a typo." into main
-rw-r--r--core/res/AndroidManifest.xml2
-rw-r--r--core/res/res/layout/app_perms_summary.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index f5635f450268..720324cf4603 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -5758,7 +5758,7 @@
<permission android:name="android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS"
android:protectionLevel="signature|privileged" />
- <!-- Allows an application to collect usage infomation about brightness slider changes.
+ <!-- Allows an application to collect usage information about brightness slider changes.
<p>Not for use by third-party applications.</p>
@hide
@SystemApi
diff --git a/core/res/res/layout/app_perms_summary.xml b/core/res/res/layout/app_perms_summary.xml
index b8d93aca755b..509b98829883 100644
--- a/core/res/res/layout/app_perms_summary.xml
+++ b/core/res/res/layout/app_perms_summary.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
-<!-- Describes permission item consisting of a group name and the list of permisisons under the group -->
+<!-- Describes permission item consisting of a group name and the list of permissions under the group -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"