tree 620a2052e246ce26bea591d2c1f53f099585dc0b
parent f83c5ba4c2cda4ca6f2ad5375b1a96115d7ce256
parent e80310760a9074342003f3ac377143a2261270c8
author TreeHugger Robot <treehugger-gerrit@google.com> 1592940493 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592940493 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 06ba19ff4e -s ours am: e80310760a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4551a02dfe5bf35baa87c634cb62eed77c64c240