tree bee7682b401932290b0a8affa3cc0dc1a12c099b
parent efb5c312d49d8ac937838445f3e75143cf8f5c0f
parent 573559b7761169fc469d07b720d6c157588f0d61
author Treehugger Robot <treehugger-gerrit@google.com> 1599283732 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599283732 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 83d5c6736f -s ours am: 573559b776 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I331d783c61aa8c3c493e9c2307e2ae7258ff2f5c