[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 48a84d855f am: 5d7f242557 -s ours am: d50cfa9b63 -s ours am: 5ff5b3187c -s ours am: bd90a0d0ff -s ours am: 762d039b47 -s ours

Browse Source

am skip reason: Change-Id Ifa4dc400eb8c87c2514a3629288657520476fbfd with SHA-1 ccc406381a is in history

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

Change-Id: Id1d5e77b125f74f3aca266b7a226cd129f73796f

...

This commit is contained in:

Bill Yi

2020-09-21 08:41:00 +00:00

committed by Automerger Merge Worker

parent a346e25409 762d039b47

commit 04d5af97b8

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