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