tree 9b46f5aed7536db27be6825b23d085033a838684
parent cf7f49fca8c796cdaf9dcf8c6a2dbb5214400a1f
parent 3893cc5f563e6016258a30d6e4075cb029082bf5
author Bill Yi <byi@google.com> 1604169504 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604169504 +0000

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d616998e4 -s ours am: db62e50634 -s ours am: 3893cc5f56 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/12960705

Change-Id: Iadddcabf965ae9f219e0714f67ad58a339f8ebe0