tree 0e5fb934a2dd694424fc891ab1c5cf42ada54d9f
parent b15b8399e443908c2c1a6dd0fad36aa3b40c4071
parent c29468777021f4970ab20b38601448fe81ecdcbb
author TreeHugger Robot <treehugger-gerrit@google.com> 1595185371 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595185371 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iaf9c22c9d05d16b653b32aa5fa48964709eeb250