tree 56b0faad67f17b4fd74b8d42c18bb55c6874e253
parent ba22df4f9ddcee68f9ab70d42eefb921e76e3135
parent 8d638d943462cfbde8b24fe4bd5dc62a2fbd367b
author Lucas Lin <lucaslin@google.com> 1615964538 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615964538 +0000

Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434

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

Change-Id: I6a91019bf0b10175885d146e77f98533ad702f8c