[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 28f8641d3d -s ours am: 45e4bc63da -s ours am: b52defa6bb -s ours am: 931922c77f -s ours am: cfbdd3cbab -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18986217 Change-Id: Id283329221c1718a2fb68eb18fda4861a00a0336 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: