tree 3c0770c76cc4db7766f05ef8140d30e597811219
parent d3ccc697fab1a8aafa123846ba92e3e0a278ff51
parent 7c1e5c711dcd59c5c974a3c85edc042f0596bd07
author Bill Yi <byi@google.com> 1606176544 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606176544 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75e3093447 -s ours am: 7c1e5c711d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I78e22426918c8112416163b183e1ec40bccc3437