| commit | 5c20c8dd08b36881a8865196b523832a7b4d0bb4 | [log] [tgz] |
|---|---|---|
| author | Bernie Innocenti <codewiz@google.com> | Fri Jul 13 10:01:06 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 10:01:06 2018 -0700 |
| tree | 9f7f9e1b26db1095b73739fb0aab44e0fcad5f92 | |
| parent | 115a99c62a1dd9b50397ceb2067a7d53f7a3b93f [diff] | |
| parent | a1622655299bcaab283f1e4674762e47e4954b68 [diff] |
[automerger skipped] Merge "vpn: allow IPSec traffic through Always-on VPN" into oc-mr1-dev am: 1e5152b539 -s ours am: b32be39c6d -s ours am: a162265529 -s ours Change-Id: I81f7ba17a82d9b58b62d0060f02da672e04cb6cf