tree 58ed14b232c7b62d278d3bba5b436284896af9f8
parent f6d554e8948da18baf613ca437c1a84096456a97
parent e8244c243e82465fc902531e79be7085af8aa5c1
author TreeHugger Robot <treehugger-gerrit@google.com> 1606814263 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606814263 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ic51d1109071ae6734bc2f8b9fc2bfa7a7714a980