| commit | e2a30af43b57c3ae291eed7288fd49ba5a1164e8 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:27 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:27 2021 +0000 |
| tree | 480b476cecc06322ed45723f7ba3db7c40123698 | |
| parent | 693f610d208f9e2a3ad7dcc708bccec40e429da2 [diff] | |
| parent | 6ecd4fdeacdd21573723bb80dec80b826eba4302 [diff] |
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: e81f2f5eb5 -s ours am: 6ecd4fdeac -s ours am skip reason: Merged-In I1822f5e4bce222f21c2d9ae02c3d4f8ed70f621a with SHA-1 72c89086d5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IPsec/+/15545495 Change-Id: I02fe67c3d5f9730cf6d47bce532a31f571275da6