tree 38a3017f73eefd1a9624a6d61b7eaf3544295514
parent e5b45ce7968d4299ca85533e14e3347d0546a750
parent 83b69dcfbb891a2022dfa9e862198c16bb5c7405
author TreeHugger Robot <treehugger-gerrit@google.com> 1595608950 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595608950 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: If6cd17f833f94fea454869ab39a24077d7e593c1