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