Skip to content
Commit bd6dd54c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+... 

[automerger skipped] Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." am: ff22e5f8 am: f85385c8 -s ours

am skip reason: Change-Id I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d with SHA-1 e613309f is in history

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

Change-Id: I072ef3331359916bcbe7888a8150e81520e9fc2a
parents 5898a771 f85385c8
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