[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2 am: cbfe64ea94 -s ours am: 0614f6da80 -s ours

Browse Source

am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067 is in history

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

Change-Id: I19f31fdbad6afd512c6728fd8d09799b06570af2

...

This commit is contained in:

Mark Chien

2020-06-20 04:39:08 +00:00

committed by Automerger Merge Worker

parent 5497e1a929 0614f6da80

commit 2a77178e63

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