diff options
| author | Xin Li <delphij@google.com> | 2021-12-14 21:24:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-14 21:24:12 +0000 |
| commit | 4b5f50729f003154e3351299a75e2d6a65eaa6f5 (patch) | |
| tree | 885a15b460e2a5f1e5c989e5dbd630d8b02a39e2 /framework-t/src/android/net/IpSecAlgorithm.java | |
| parent | 89bb4b174110f108eccd0881b617a78f2f771e6d (diff) | |
| parent | 936edfacd3666dde9b4055d552116a441ee43e5f (diff) | |
[automerger skipped] Merge "Merge Android 12 QPR1" am: 78129f3c2e -s ours am: 936edfacd3 -s ours
am skip reason: Merged-In Ibcfed4617dcaea3b81e5d3a3eb68e6494488c7f7 with SHA-1 655d7f9857 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1921235
Change-Id: Ib2be8e0ddbda62bf7df1a1fd062e672faa55dd5a
Diffstat (limited to 'framework-t/src/android/net/IpSecAlgorithm.java')
0 files changed, 0 insertions, 0 deletions