tree 694bda540111ea58c997e510d31dc29544587216
parent ab0b3a5cf74413a887403e8b12871ca12fe169db
parent e15048a9f2ba045f76a7ef8dc5d5f2798dd8b4f5
author TreeHugger Robot <treehugger-gerrit@google.com> 1600709157 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600709157 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 0ac5999aa2 -s ours am: e15048a9f2 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12652571

Change-Id: I6fefce53cc4ccf1670ab1ccfbcf98fd1ed44e480