| commit | 7d67dda5c3ea17b6a794a5ecc975c6394095fdf0 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Tue Mar 02 21:08:15 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 21:08:15 2021 +0000 |
| tree | 9a4e29be779ae3254b5135d6c71cbe3b6611ebff | |
| parent | d73af919b6dbc1b676d1fcbf2bbe013a11f62b8c [diff] | |
| parent | ca72617385a1d4d5bbdcf8564f4d6e5af945f6d6 [diff] |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18