| commit | 00a45d40b06832791d290daf28ae4973f8456d03 | [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 | a5ebe2ef1b5f8f4b28aba552f383b511465c814a | |
| parent | 5fe13112419d623a327b24b03bb16d07e28470a4 [diff] | |
| parent | b683d6898c16c03c26288175a8907a758ab610be [diff] |
[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 4ae4410678 am: b707122936 am: b683d6898c -s ours am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 4d604c81db is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218 Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f