| commit | 5d3ca7b19c917c49c1c3da647e2348d5bc5a2d15 | [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 | 393e95a78c044dc6512bd4f727c3d5e06100b0e5 | |
| parent | 13598d6591b275b2736522da9fe34369603153a9 [diff] | |
| parent | 537e4415b1f67a72ccd60f3b0e74a07308f3ae9d [diff] |
[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 133733bdd2 am: dc50757d4d am: 537e4415b1 -s ours am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5acb6b6d4e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218 Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f