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