commit | 9fb7d8f7a206db1829f071eaee5b36e5b96f46d6 | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Wed Feb 17 22:29:33 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 17 22:29:33 2021 +0000 |
tree | 575b6b7bd85dd4c665d38d9389576f407e940698 | |
parent | efa809eea0f24cc10b4ec127642fc0f41a054ec6 [diff] | |
parent | e0610fe112554505876b7246f87ab3d21f0d494b [diff] |
Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d4516d am: 14e64c42ad am: e0610fe112 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553154 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5f0336b434f42cba3bce793d8ec8d16a401bf117