Merge "Change the parameter type from ContentResolver to Context" into sc-dev
tree: 181bf7747ba5ed2a32b7ad396a224b597da0dd0a
  1. framework/
  2. service/
  3. OWNERS