commit | d1b028d2bf0e2d4b58fa839c1a81a9c83a5affec | [log] [tgz] |
---|---|---|
author | Yan Yan <evitayan@google.com> | Mon Dec 14 19:52:22 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 14 19:52:22 2020 +0000 |
tree | 9149ea5efeabc98e1c4fc80633f5db939a9eeaf1 | |
parent | 5a4d071bd72683d0818ccd7f32f4860f004d5853 [diff] | |
parent | 020b6d4556525a39263ba8a1df9aa8e6a1f6187c [diff] |
Merge changes from topic "sdk-level" am: 8a4b9d6397 am: 020b6d4556 Original change: https://android-review.googlesource.com/c/platform/packages/modules/IPsec/+/1522443 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib0cf337ec13b72bd94a4147e66a8e7b47b29386c