tree dea6616ad349dd65817dd450f550806bf174e8de
parent 2f397323d4f530550ba15bc4161eacba8850017f
parent 7e44c5584fb6349e3b47eda5b11de70085480c26
author TreeHugger Robot <treehugger-gerrit@google.com> 1607328819 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607328819 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e44c5584f -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia69aefd79b322d0bc5f2688f415ff5aa5ef9ae99