tree c43b959ebcbe451da1190f98d4d90e0d35e58932
parent ce608eefc8f61536b3045056c847ad8f1708c7d8
parent 21952d24d6d4dd33763b96d4f8a2084e1ad93037
author Treehugger Robot <treehugger-gerrit@google.com> 1599203204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599203204 +0000

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21952d24d6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1c5fa8fe9a14dcf04b2d1eb043591ff8b44b3c38