tree f2810f92b50d970d2f622d286acf5ff2ac921fbe
parent d80965475d7eda6b30c17f0c64664a70efa86526
parent 86bb13d72bd7e3a6eb321801f31a28d97249a84a
author TreeHugger Robot <treehugger-gerrit@google.com> 1599140717 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599140717 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If8b2137d0796c6c8245d2bd43ea9bcf92e2a9c89