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