tree 7cd49368d5c807f0230d697672a27df038af1f0d
parent eb57d4f0843dc6815e88ca524dfb3c8b43d6ccde
parent e8dfd91dbf8497ae67239141d1bbeaf03d054ebc
author TreeHugger Robot <treehugger-gerrit@google.com> 1599069065 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599069065 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b1f16b637e -s ours am: 372c5529d3 -s ours am: e8dfd91dbf -s ours

am skip reason: subject contains skip directive

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

Change-Id: I70f85f3936d2cc7134600cb7f38a27456073afac