tree 381ce7dc19b98d50fcbf6c218f0aba2b1493525c
parent 6b0f06c08022faa43837bb4930d619df4491f145
parent d6d4011f5853596e0d66e746484f1f311fdc3003
author Anton Hansson <hansson@google.com> 1617182794 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617182794 +0000

Merge "Use framework-annotations-lib" am: d6d4011f58

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

Change-Id: Ie3feaf684a5e1bb79d919cb346029ba57f2594b9