[automerger skipped] Merge "Add session ID to VpnTransportInfo" am: 24aca4c9dd am: 864f0858ab am: 7cbc124143 -s ours am: af9fd21d61 -s ours

Browse Source

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: I73b0db3f49e0791899c9b69b30b53b521b54520b

...

This commit is contained in:

Frank Li

2021-04-06 08:12:06 +00:00

committed by Automerger Merge Worker

parent 54461a0d01 af9fd21d61

commit 922264a098

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available