| commit | 44b5fb7c5f9fc819bdc5b32ecaf95bbd64322840 | [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 | 49fa17d78130e61053d0e5ad1a32f07a588b95ac | |
| parent | af20002be1f5d1ca5117d402762ec3d7d24cba15 [diff] | |
| parent | ee9f2d38dd721cda196069c0ef819d37c35347ae [diff] |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: d3a444609a am: ecc13abaa0 am: ee9f2d38dd Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2477f98c4aeaa6059944a204cc14db5b6fb5fc63