tree bee7682b401932290b0a8affa3cc0dc1a12c099b
parent e445a9438de0d31e7806d48467e9d5865f175f82
parent 228aa6e038bee602a503801c49d5444f65472755
author Treehugger Robot <treehugger-gerrit@google.com> 1599374960 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599374960 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 90b0d3f83e -s ours am: 228aa6e038 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib1bd570ab0bf5aebc2ef61ea9844de6b93c9b72e