Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfdbf1db 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... 

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08eaddeaaa14a6e92008b6bb9c0cbb7b13374af1
parents a5bac75b b461146f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment