[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev

Browse Source

am: 1e5152b539  -s ours

Change-Id: I2ada9a973b1728122a2beb5f47d105af4507c742

...

This commit is contained in:

Bernie Innocenti

2018-07-13 09:17:17 -07:00

committed by android-build-merger

parent 903d59735e 1e5152b539

commit b32be39c6d

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