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