tree 3526ccd8c67d7811a31ecafc069ce209d105f3fb
parent f0494f08e7133816d4a2f07821d9826a45ff443e
parent 778e670dc7541d5cbb49f62318ddd292711f7556
author TreeHugger Robot <treehugger-gerrit@google.com> 1607329741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607329741 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 7e44c5584f -s ours am: 778e670dc7 -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: I333797ad36c25bc19c4c0547a6792ca21f194bdd