| commit | b683d6898c16c03c26288175a8907a758ab610be | [log] [tgz] |
|---|---|---|
| author | Frank Li <lifr@google.com> | Tue Apr 06 07:35:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 07:35:06 2021 +0000 |
| tree | 589b4beb0e5f345437e210684ba4b01a76f35836 | |
| parent | 702e85008f8ca4dc3e3320450bde72fbf277b837 [diff] | |
| parent | b707122936769dbeecef36ef98b1278d4487b0af [diff] |
Merge "Add session ID to VpnTransportInfo" am: 4ae4410678 am: b707122936 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218 Change-Id: I554a86b2445f0449e5556871f553158dff19e192