tree 142418e659c7eacfa9dd5cce84755fbcdb61ef33
parent dd98f7a35b8c05da0ffdfcd69239726939ae15d9
parent f769e1ecb0e7626b2712cd5546940a22467c0e4b
author Yan Yan <evitayan@google.com> 1602890653 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602890653 +0000

Merge changes from topic "new-ipsec-api" am: 46f82d282a am: 2580e7a9f1 am: f769e1ecb0

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

Change-Id: I2f7b92f59747df7a78ce72ff5df26d486907be56