Skip to content
Commit b461146f authored by Yan Yan's avatar Yan Yan Committed by Automerger Merge Worker
Browse files

Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa am: d57ace3a am: 2b5329cf 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63
parents 9ac36e42 2b5329cf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment