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