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