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