diff options
| author | Bill Yi <byi@google.com> | 2022-09-27 18:34:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-09-27 18:34:03 +0000 |
| commit | d4fcfae18a2871abb326901b23931cf30bb5188a (patch) | |
| tree | f252dff34ca2b10c01f7d799ef89effdf85d33e1 /framework-t/src/android/net/IpSecAlgorithm.java | |
| parent | f99ccec15a503c9347e53b8224b6cc3c45b02f75 (diff) | |
| parent | 85ed1b60c138f47567275c1ecd52df641b70418e (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: cba60c2c47 -s ours am: 85ed1b60c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/20037154
Change-Id: I2efa825a1d26b3d3cdbc1bc47231e56774fd2612
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