commit | d3a2ea3d11b98a6cc6a548a3b5c731615fbe8f31 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Oct 07 08:16:10 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 07 08:16:10 2020 +0000 |
tree | 102a5f16800a21c1ba889a38cd75edf2acd73228 | |
parent | 2967fc4cd6d3d6a08c09574c53228b003a4e43b8 [diff] | |
parent | c40e4518c725e05af3aa02774c55010a2c8d93ac [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 6057a6e918 -s ours am: a46c4e3455 -s ours am: c40e4518c7 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12775748 Change-Id: I05443ecacd569d50f07efc28923c4252a0bb18fc