[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 5ee7a7d07d
am: ddbd32432e
am: 5c73826020
-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: Ia2b0bf14f32d65ad0f5e44100b9dcc3402b21a3b
This commit is contained in: