Bonian Chen db4a6cf215 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46 am: 1e744b4e66 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I056de36c838732748f0cf445075ae87f4269a2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-07-29 11:09:22 +00:00

..

aliases.xml

…

arrays.xml

Clean up unused PreviewSeekBarPreferenceFragment

2022-06-05 16:52:20 +08:00

attrs.xml

…

bools.xml

Bool to note Pending Intent bug fixed

2022-07-21 11:01:15 +00:00

colors.xml

…

config.xml

resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46

2022-07-29 10:43:54 +00:00

dimens.xml

Merge "Add field to control margin in FaceEnrollIntro" into tm-d1-dev am: c99fa169ca

2022-06-30 19:06:42 +00:00

donottranslate.xml

…

ids.xml

…

integers.xml

…

menu_keys.xml

…

strings.xml

Clean up unused string resources

2022-07-28 15:05:02 +08:00

styles_preference.xml

…

styles.xml

Show full package name in cred app

2022-06-02 10:00:51 +00:00

themes_suw.xml

Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4.

2022-05-26 07:17:36 +00:00

themes.xml

…