tree 6ffd518a44ff101b6404593cf0381da0b9ecc80d
parent e6eed176fc5759ffa96dceacc6124d5cbda75770
parent aa9c6c2de6b6cf5228f8e95bdd43825ce19ad56e
author TreeHugger Robot <treehugger-gerrit@google.com> 1623769975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1623769975 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ie7187524232c8b192d0e51f719d2a1a406178388