| commit | 56c8a12db785b9a7a30e23c512a69b4d7be22849 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Tue Mar 02 21:35:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 02 21:35:55 2021 +0000 |
| tree | f5bc65c587d962870ee0ac7e78de7b3ce82eab8d | |
| parent | 62162a5b3299b9bb8371940ab019be45c052f22e [diff] | |
| parent | df431e094ecbe4fa006ab5073983b98e75dfa9ab [diff] |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 am: 7d67dda5c3 am: df431e094e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63