| commit | af9fd21d6183cf5a8167fd670906ef0a3d5f3daf | [log] [tgz] |
|---|---|---|
| author | Frank Li <lifr@google.com> | Tue Apr 06 07:57:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 07:57:52 2021 +0000 |
| tree | 63d6e4be2a6b85c0d0a359a9a4dcd4b2437554a1 | |
| parent | 5d45b88180d49bd1018a928c7c75c9f79e832355 [diff] | |
| parent | 7cbc12414328be43dd3359232e208bfdd93e910b [diff] |
[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 24aca4c9dd am: 864f0858ab am: 7cbc124143 -s ours am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5243e14163 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218 Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f