tree 390faf13c967870400726ca40f68bd4fce327814
parent b30a1434b98469fd0cf12d9dd5a1980ed329e078
parent 9f7daa495f99f4ab7de5c4355ad22612ddc65937
author TreeHugger Robot <treehugger-gerrit@google.com> 1594043908 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594043908 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 9f7daa495f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I16d9d26805870fa251694a70ec441462eca5ebd8