summaryrefslogtreecommitdiff
path: root/framework-t/src/android/net/IpSecAlgorithm.java
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-08-29 03:16:02 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-29 03:16:02 +0000
commit5992e0e381198a5992f8bae28205bd27f8a7e3f1 (patch)
tree43bfa0a2b0f1a935ffe65d8bb415efc9572c4155 /framework-t/src/android/net/IpSecAlgorithm.java
parent8b08fa9d30ae07e39889c7f7e3a7a6f789fdbaf6 (diff)
parent6d26c2c0f14ebfe0b294cdf57960685e1cd264ab (diff)
[automerger skipped] Merge changes from topic "presubmit-am-7c4b9616a6bc4dd9b71492ee4ee7d2a5" into sc-mainline-prod am: 6d26c2c0f1 -s ours
am skip reason: Merged-In I0bf17f837bfbe4e6558781d807509b2014658574 with SHA-1 1591891486 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/19494229 Change-Id: I10f6396dfdaa0ad03726721043b891a5f6533074 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