commit | 7caabcdb80ff6cccaa0a41cd3b68c2abf5cdc9ca | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sun Sep 12 13:22:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Sep 12 13:22:38 2021 +0000 |
tree | 48a3cee0938cecf4f7382ef19e73f7a817610a55 | |
parent | 8b853903ac66c32fdbea6a6f66e865f36f171e36 [diff] | |
parent | 917ddb1e50933a7ceb810679313125e2119c9e4a [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 1acb5f5f91 -s ours am: 917ddb1e50 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/15806644 Change-Id: Ib38b74d9d6b02068c65c2be8a4983480d0cb1581