Merge "resolve merge conflicts of cfcf58354c to sc-dev" into sc-dev am: a173e4eee5

Browse Source

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94782b1ab3e5c237d804cbb5941c264fc7990fe1

...

This commit is contained in:

Bob Badour

2021-02-21 20:24:42 +00:00

committed by Automerger Merge Worker

parent 50e3d50753 a173e4eee5

commit fb00d1c5b3

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