tree dea6616ad349dd65817dd450f550806bf174e8de
parent d4ad028561189b96a967ad871b733b0543a891e0
parent fd97d0e3a8fb723a46a24416ac3cba5fea599a22
author Treehugger Robot <treehugger-gerrit@google.com> 1607271295 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607271295 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e7e61fa766 -s ours am: fd97d0e3a8 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1519227

Change-Id: I1c9a071fa1556ac8f0f35a88021e7caa8ed0bf85