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

Browse Source

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

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

...

This commit is contained in:

TreeHugger Robot

2022-11-16 14:28:36 +00:00

committed by Automerger Merge Worker

parent 1b70bcbdc4 2904ea9410

commit 6dd4a1c56c

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