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

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

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

2022-07-29 10:27:37 +00:00

..

aliases.xml

…

arrays.xml

…

attrs.xml

…

colors.xml

…

config.xml

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

2022-07-29 10:27:37 +00:00

dimens.xml

…

donottranslate.xml

…

ids.xml

…

integers.xml

…

menu_keys.xml

…

strings.xml

…

styles_preference.xml

…

styles.xml

…

themes_suw.xml

…

themes.xml

…