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