| commit | 1f3f2daefcfb21c728cd9f80310a709c2787d8a5 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Wed Jan 22 22:09:41 2020 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jan 22 22:09:41 2020 -0800 |
| tree | c1768bbc3f134d4e3c301a1da2a4178f05a3f838 | |
| parent | 05bea2cbd5651cac4a14e495aacb05c8731cd2da [diff] | |
| parent | ec7b665e6e2cf157ecdb615dcffbaf949e8dea84 [diff] |
Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e