tree a4bc69693be97f1e19204d6d27247d4fc731ecfb
parent 9756072ca7f4389cb159599da5f3b670dc1cb644
parent 49b4056dd67870c1c15f19004da3e9b2d50b27d9
author TreeHugger Robot <treehugger-gerrit@google.com> 1596985244 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596985244 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: I39ecdf3100b88abead2568fdd6a3448c28941f25