tree 3a87da8c1b0e6643b38554e2577301a6b992995b
parent ef27c66392b40900f18519f4cb5ec9e03e097527
parent e669aa4657908d5cd03606f0cd4bd3b29cf1338b
author TreeHugger Robot <treehugger-gerrit@google.com> 1599117767 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599117767 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: bc080eb257 -s ours am: 29170e5f45 -s ours am: 25e69b7fdd -s ours am: e669aa4657 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If5b7b3eddc5b61f94962f7d338c7630827295d27