diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-09-01 12:35:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-01 12:35:42 +0000 |
| commit | 8b7d217be00e11ac95c943a24cb47a78a308c11e (patch) | |
| tree | abcdb176ea8875b281921234250bc0672f7a7abf /framework-t/src/android/net/IpSecAlgorithm.java | |
| parent | 5aaae98fc0e78ea07f0011328d9be1ed4ff6c534 (diff) | |
| parent | 601caaa4bb6bb06d79b587811b872dba988c4a66 (diff) | |
[automerger skipped] Merge changes from topic "presubmit-am-25573e946ece4fa1804202119abb6474-sc-dev" into sc-mainline-prod am: 58a9eef654 -s ours am: 601caaa4bb -s ours
am skip reason: Merged-In Ib1701358f9058aeaaa336be8d074cfaa700c4309 with SHA-1 9a2a8e5205 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19784418
Change-Id: I335d2039d8462229f828f7af17bfd120dd75ef9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'framework-t/src/android/net/IpSecAlgorithm.java')
0 files changed, 0 insertions, 0 deletions