commit | ac706f8f43f2563cce07aea19b3dc26f398b1d17 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 22:57:42 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:57:42 2023 +0000 |
tree | 0ed9f2070e972b7780649092beb867f5d33039a1 | |
parent | ae9a9919e9bbc588d10f4702a6fe964b15a5b6f1 [diff] | |
parent | 5342e21b16a132dec2816dc228da02caa83a124d [diff] |
[automerger skipped] Merge Android 14 QPR1 am: 0ce0f431c0 -s ours am: 55f4437b5e -s ours am: 5342e21b16 -s ours am skip reason: Merged-In I155f611bcd01c511fd5ed88cab2ca1df1fa1000b with SHA-1 23af1773e1 is already in history Original change: https://android-review.googlesource.com/c/platform/prebuilts/module_sdk/IPsec/+/2862802 Change-Id: Ia95f7c96d13972f706dfcf062150d70885c1e5f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>