tree b7991121d710e1dec57cee3aac59c652739e2e03
parent de9636a50ff44c26aae426ed7cde33a4864ad025
parent 8dd7c8e625fe2af02ab9ce747c34ff544c294fbe
author Paul Duffin <paulduffin@google.com> 1620853062 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620853062 +0000

[automerger skipped] Merge "Add mediaprovider-module-sdk build target." am: f7443f434e am: c939f5e5e0 am: 8dd7c8e625 -s ours

am skip reason: Merged-In I631eb785e0f435e227559114183e89d390617da2 with SHA-1 47753b4537 is already in history

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

Change-Id: I66301b15430e59fdabb2f1c373c9282e0dd65356