tree f744e3048eb64460d724c8b82fb4b3ec8675251d
parent 4b5268411ce3dcc37d3d8cb5a8d39809ab0bbda7
parent 29a1e9dbbe73fc0e29f8273fe166f3a320f9b19f
author TreeHugger Robot <treehugger-gerrit@google.com> 1595194766 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595194766 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: ce1434bcc1 -s ours am: 8dce3add3f -s ours am: fb7c7b54af -s ours am: 29a1e9dbbe -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1ba39afdbc646b2b33af66ae071e0cecef0e15d7