[automerge] [Pnalingual] Resolve code conflict. 2p: 6436a5aa6f 2p: 9d162016b9

Browse Source

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

Bug: 228292561
Change-Id: I120235e895b8542275a84a314d9cf89ebad088f7

...

This commit is contained in:

Presubmit Automerger Backend

2022-04-06 11:08:01 +00:00

parent ea1878eed1 9d162016b9

commit 58bd2faec6

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