tree 7c46f20f204c4e59b7e8c2c574a90d3e002978aa
parent f6adb01d2443b259ebc4b731c977228aa65c4f99
parent 45d9b25a3613e363d372c162533f45de9a4323cf
author Frank Li <lifr@google.com> 1617694163 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617694163 +0000

Merge "Add session ID to VpnTransportInfo" am: 320cd17220 am: 45d9b25a36

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1652217

Change-Id: I0011ffa4d24d9680e79241a120ea7c4904d88d67