tree c43b959ebcbe451da1190f98d4d90e0d35e58932
parent 0d88970647a35a6c2f1f067db3d015b36f9e7933
parent b3ea91190e07436de726e3980beb4cd23f40e451
author Treehugger Robot <treehugger-gerrit@google.com> 1599280154 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599280154 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ie154cd998f230923be146807739437ea9a363395