tree 777ffab2be381cbd7639ba7d617f5273f36c7a16
parent 93a785bd6b25ba2c5f58c5624e68fbdfcb5b519f
parent cb5aed6518265b15a23b2b552d942f1a3a30cfb6
author Yan Yan <evitayan@google.com> 1602889651 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602889651 +0000

Merge changes from topic "new-ipsec-api" am: a80fb3bbe6 am: cb5aed6518

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1398433

Change-Id: I45530694608909ddbb21d037cc3302130d8140c7