[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fb3283d1c3 -s ours am: d3d417248b -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117073 Change-Id: I664a88815ed9c12fbc77f54692b1e8c6b6b1578e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: