tree e783e66afb06d9d40a4cb489bc477f489757bec1
parent 60ebaf21643e4fd4fae879fb8617c816368571e9
parent c7901e9194391f13b0bf0dc595b27141607cfc46
author TreeHugger Robot <treehugger-gerrit@google.com> 1594565700 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594565700 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: ca8a77ea51 -s ours am: c7901e9194 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7c262a79ce327b372356632f7e3085ad446dbe26