[automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours

Browse Source

am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: Ie39f3baca4e2059d4e4e1db1a65dd42137223b9d

...

This commit is contained in:

Xin Li

2020-09-11 00:40:25 +00:00

committed by Automerger Merge Worker

parent ada75ad54d 36cfa7db8e

commit 3fd1488575

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