| commit | a1622655299bcaab283f1e4674762e47e4954b68 | [log] [tgz] |
|---|---|---|
| author | Bernie Innocenti <codewiz@google.com> | Fri Jul 13 09:28:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 09:28:39 2018 -0700 |
| tree | 39dac666f99e20f5973cc99d998e666466e71083 | |
| parent | cf164db36fe350f02d7df3158666569d97662780 [diff] | |
| parent | b32be39c6d0d3ed2adc81c2cda4aaffcd5266679 [diff] |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev am: 1e5152b539 -s ours am: b32be39c6d -s ours Change-Id: Ia1dfd55946842083d4e3256a51607cecf59a67b8