[automerger skipped] Merge changes from topic "am-aaa7d89ac39d4f63b72ca511f2b60832" into sc-v2-dev-plus-aosp am: 22a096c969 -s ours

Browse Source

am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 56a88885cc is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I24c7963f542e76992b10ff4f520b3e860d76965f

...

This commit is contained in:

Automerger Merge Worker

2021-10-08 08:05:35 +00:00

parent 689f915b39 22a096c969

commit 2a4668ccc9

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