diff options
| author | Bernie Innocenti <codewiz@google.com> | 2018-07-13 09:17:17 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-07-13 09:17:17 -0700 |
| commit | b32be39c6d0d3ed2adc81c2cda4aaffcd5266679 (patch) | |
| tree | 42252a02c00789da3dfce676f3e428ec576ce311 | |
| parent | 903d59735ec238c2630dd5707b06f9bac1b23572 (diff) | |
| parent | 1e5152b5397686bef4705e6bf132765c4461a764 (diff) | |
| download | base-b32be39c6d0d3ed2adc81c2cda4aaffcd5266679.tar.gz | |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev
am: 1e5152b539 -s ours
Change-Id: I2ada9a973b1728122a2beb5f47d105af4507c742
0 files changed, 0 insertions, 0 deletions