tree 53eaf704ed175a4da9eac011ea07ce3df572eb48
parent 6716685fee0c61bb338da28a760fe2e98d3a4ae3
parent 8bc164e4939749f566ca56455c7ceb7f3e65f2ce
author TreeHugger Robot <treehugger-gerrit@google.com> 1599075322 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599075322 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 14a9e208c7 -s ours am: 424cf3e399 -s ours am: bf9c988a60 -s ours am: 8bc164e493 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2c19c905f7fe1bb71f206d24764b5c517f72e4e0