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