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