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