tree 34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b
parent 38f524c2ff921637009b8d6067af99f055393226
parent f0549de43e8792825280f7f392de024ba514c359
author TreeHugger Robot <treehugger-gerrit@google.com> 1604123948 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604123948 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 0d780d5eb0 -s ours am: 7cf6a47050 -s ours am: 5a0d21f262 -s ours am: f0549de43e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5bedfd33bf7cce5cb3bc857d93587e39e8bd0ade