Merge "[automerger skipped] Resolve the endpoint in legacy VPN am: 002944f78e am: 926a2a40cf -s ours" into rvc-qpr-dev-plus-aosp am: 496ee02096 -s ours

Browse Source

am skip reason: Change-Id I96691f6091c43377f23a00621242ed034fcb0444 with SHA-1 9da9925389 is in history

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

Change-Id: I4df4adf27b866a4111ab6c4d8a63903dd26c39c9

...

This commit is contained in:

Automerger Merge Worker

2020-08-07 07:05:11 +00:00

parent 5f6aa76ca2 496ee02096

commit a2fac8d146

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