| commit | 1ebbd0bb6b36b9308bc6ef1cead31ec7d2f72cd9 | [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 | f0264f8d76e5890d4ea25815ddb5da93691ae4f2 | |
| parent | ef9a466f45c58301438180ebd9dfe8b63b03a76c [diff] | |
| parent | adb79e3b3946ccd5cc91bd4123991dce7d2e6ad7 [diff] |
Merge changes from topic "add-ikev2-vpn-types" am: adb79e3b39 Change-Id: I205121bbd8ef8adbe5e7a5ea1c57bbcac0efae0e