[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64d2330914 -s ours am: 71f9ff258a -s ours am: 0bf4f27123 -s ours am: 478b4df6b2 -s ours

Browse Source

am skip reason: Change-Id I614914b738e3af198fe21b881d2e475e2e8eda41 with SHA-1 cbebca9881 is in history

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

Change-Id: If41ba232497c0aaf7fbe5496b09ba7b4a4905e15

...

This commit is contained in:

Xin Li

2020-06-08 16:42:02 +00:00

committed by Automerger Merge Worker

parent 61ee053e43 478b4df6b2

commit 8b37ae8d14

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