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

Browse Source

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

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

Change-Id: I072ef3331359916bcbe7888a8150e81520e9fc2a

...

This commit is contained in:

Treehugger Robot

2020-06-15 11:25:15 +00:00

committed by Automerger Merge Worker

parent 5898a771fc f85385c8de

commit bd6dd54c7e

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