[automerger skipped] Merge "Set legacy type for VPN" into sc-dev am: e1b6e11c72 am: cdd03d6d65 -s ours

Browse Source

am skip reason: Merged-In I237f7ff4d6899530c4ad057a84d3b8b34513be79 with SHA-1 d1de5bd3d9 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14963618

Change-Id: I478aac115acb4082f76f39bbd8a97d5d1134a5c1

...

This commit is contained in:

Lucas Lin

2021-06-18 03:14:51 +00:00

committed by Automerger Merge Worker

parent 1c5f09c884 cdd03d6d65

commit 047546706c

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