| commit | 2b5329cf52154a2c71b8c0f2b8db21aab03bcbee | [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 | e08696fab95228a50104b5497df5a9b45fcd74d8 | |
| parent | bf44fe48e6b41065e85e9e7fd5a7d2affac02176 [diff] | |
| parent | d57ace3aa462f9422acd59ff40b8e92490e056bb [diff] |
Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: 8c7f74fa35 am: d57ace3aa4 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd