tree 689cf430f83c28b9ba9c88db7868bc72c1dcecfd
parent 0bf77bd9c66cff216426a15252fc72263f5aa3f0
parent 210dc47d2bd436991613c9df071ad64d7846a325
author Treehugger Robot <treehugger-gerrit@google.com> 1607270861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607270861 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Iae372e5484ccdff96f5167f8e5bf3bf4d90cabea