tree f598614450cdb36e09996cb7ad3dc3566f01b3f2
parent 923063efd0f2e0966ea092c9958fec75f13e382c
parent 106c6aa62929d7f655fe6ff6edaa6101ef626123
author Bill Yi <byi@google.com> 1627699660 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1627699660 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 230e1fb647 -s ours am: 106c6aa629 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/15433152

Change-Id: Ib324a96f75192cd92939c776da65e7ad371fbf26