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