Merge commit '3a00d763dfb22982987e08f4c8751fe68451ed0d' * commit '3a00d763dfb22982987e08f4c8751fe68451ed0d': remove unused ContentResolver parameter from IntentResolver.queryIntent.
Merge commit '3a00d763dfb22982987e08f4c8751fe68451ed0d' * commit '3a00d763dfb22982987e08f4c8751fe68451ed0d': remove unused ContentResolver parameter from IntentResolver.queryIntent.