tree 771dc12a8cb9cd793c4b2b15a219076e3d0c92a7
parent 903ed6ea7826f8076030b7bd766157c2237e25d5
parent 68755307c0cd1bac9ac958ec5eccb7445a6a91bb
author TreeHugger Robot <treehugger-gerrit@google.com> 1598049109 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598049109 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ie65978b57516e3ffe66369b5d55020411885b526