Merge "[Settings] Fix merge confliction" into stage-aosp-master am: 2904ea9410 am: 6dd4a1c56c

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2022-11-16 20:01:08 +00:00

committed by Automerger Merge Worker

parent dd5e46746c 6dd4a1c56c

commit 5520882e9c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available