tree 2a473ffa2b36f6bf6dc69136d1c4acfb998635ec
parent 4e779e32f4e50e75e0c048aaf94e7e027bf38c8e
parent ae48b606a7bc82ba3b8400a5f73ce6298a933235
author Treehugger Robot <treehugger-gerrit@google.com> 1599403475 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599403475 +0000

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

am skip reason: subject contains skip directive

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

Change-Id: Ifcfc477bf35e2e03f58a85ced233a1fb0eda4155