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