[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd89d91847 -s ours am: da33eadd10 -s ours am: e8bd87c530 -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539361 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee21fd430b66c73fc05e6a1382b583ad008a33be
This commit is contained in: