[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
am: ddbd32432e
am: 5c73826020
-s ours am: a565961bf0
-s ours
am skip reason: skip tag Change-Id I6c06460b67f81112db311f0739457d5f1e2e4554 with SHA-1 8ffc3908ff
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1639939
Change-Id: I416f3e7af6a09e5e6b5b80cdbd6749ce04fc2f5a
This commit is contained in: