[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 94c8353286 am: e7038aa1a3 -s ours am: 657e0f3008 -s ours am: 379ae6c7b8 -s ours am: 95e4eb59e4 -s ours am: 10c930c4c0 -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: I5163c4d5c207c7046bc90e2ac2da08f01912cf5d

...

This commit is contained in:

Bill Yi

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

committed by Automerger Merge Worker

parent 04d5af97b8 10c930c4c0

commit 71ecd41c8a

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