diff options
| author | 2024-02-13 08:30:14 +0000 | |
|---|---|---|
| committer | 2024-02-13 08:30:14 +0000 | |
| commit | 2738a8590ca5297bbc500db55e79b74f69e6caff (patch) | |
| tree | 68c1104d65e8724ccfe21e11646f4df3df5d829a | |
| parent | dec0c28a3e76e7d69a30be1e2f5b1ae590222d56 (diff) | |
| parent | c88cf9f4e9aeac6d98d2512509f20fd7be114817 (diff) | |
Merge "Fix a typo." into main am: 034f11bb0b am: c88cf9f4e9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957033
Change-Id: Ic33bfc59fcadac68c038ddc6f1a7c0517f8d49ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/res/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | core/res/res/layout/app_perms_summary.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index a2ce212a5a53..75fbff330f49 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -5922,7 +5922,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" |