| commit | 6e1557d8ca140874dd5ff2b2f78f01a299269b9f | [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 | d2e0f29a08fa13bfbbbb3a6ca6fb9b554d68d279 [diff] | |
| parent | 80240acd3f3f1332022d81d549fcb52d872c9c5a [diff] |
Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e