tree 7cd8b8e98400a403cb244970923cb2a42728724e
parent 0cb852b73999b5e895ce77d16f301449b4f2a331
parent c6758808179fc43cbbba8dcf81e741166056d693
author TreeHugger Robot <treehugger-gerrit@google.com> 1604114915 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604114915 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 841ae01c5c -s ours am: 521309ff46 -s ours am: c675880817 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I839bf3cac72fa5790703414c4c516cc66f1cb926