| commit | e4dc066e12bc1ab5fd4f1525503d137ac398c415 | [log] [tgz] |
|---|---|---|
| author | Bernie Innocenti <codewiz@google.com> | Fri Jul 13 10:14:24 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 10:14:24 2018 -0700 |
| tree | 39dac666f99e20f5973cc99d998e666466e71083 | |
| parent | a1622655299bcaab283f1e4674762e47e4954b68 [diff] | |
| parent | 66bbd64d7d0317b605d62b930fdfb891573cae1e [diff] |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-dev am: 8f1c70e49b am: d1f53d13a9 -s ours am: 213af1a79e -s ours am: 66bbd64d7d -s ours Change-Id: I58c75d2ec05c1470cabed265fa6d4e095ff698b8