am 8ad6ec2e: am 8280c2b1: Implement new MockContentProvider. Also make...
am 8ad6ec2e: am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.
Merge commit '8ad6ec2e'
* commit '8ad6ec2e':
Implement new MockContentProvider. Also make ContentProvider aware of the class.