tree 5af61200cc18b111678c779a109ada623394a8f5
parent 35388ba2710b04eb238c98bc654d5ea4ed935f3f
parent dc1c679bb34fe7f30c956be44a963b525837c5d2
author TreeHugger Robot <treehugger-gerrit@google.com> 1596984446 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596984446 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I8fd552d13b2935e68f2ad678b5b9c7c763a21a30