Skip to content
Commit af9fd21d authored by Frank Li's avatar Frank Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 24aca4c9... 

[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 24aca4c9 am: 864f0858 am: 7cbc1241 -s ours

am skip reason: skip tag Change-Id I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d with SHA-1 5243e141 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652218

Change-Id: Idcdd09ad0e7c11482dc048dd30f4a72a7e294b2f
parents 5d45b881 7cbc1241
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment