| commit | 81abc16c372881c3e5384cd625a3752469ae8315 | [log] [tgz] |
|---|---|---|
| author | Yan Yan <evitayan@google.com> | Thu Feb 10 02:56:36 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 10 02:56:36 2022 +0000 |
| tree | 0d0bd1fe9415e5cb2b55235bd365348b4a184bee | |
| parent | c9f4df013ae0800bc9d699358ce6cea6028eaced [diff] | |
| parent | 39e6068323c92b682485431036d4a0f8abd4d3bc [diff] |
[automerger skipped] Merge "Un-finalize IpSecManager" am: 59f6394516 am: 44cc9d20d1 am: 4da8bc86b3 am: 39e6068323 -s ours am skip reason: Merged-In I29f3ac96f83b4271f29a7051d33ccf47a0dd6c57 with SHA-1 0329922cec is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1970081 Change-Id: If1738a59090e0e72b887c4e9fcfae05505716409