| commit | 213af1a79e2514f0b7ee7814e485fb80573fd43a | [log] [tgz] |
|---|---|---|
| author | Bernie Innocenti <codewiz@google.com> | Fri Jul 13 09:28:11 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 09:28:11 2018 -0700 |
| tree | 89516f1af28cf3726cb09d5953416a62f2e38bd3 | |
| parent | 1e5152b5397686bef4705e6bf132765c4461a764 [diff] | |
| parent | d1f53d13a9d2b22fc2e7573b1b05d8ae9fc56126 [diff] |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am: 8f1c70e49b am: d1f53d13a9 -s ours Change-Id: I293fc38d50e75b0b021dff6af045ac8a2aa6927f