tree 162f049f3b4a8e541a39ec546cd9c94b85d815c1
parent cdeed7887323048cc42e9c62f3205340a91b97bc
parent 8280c2b15f6875b2d387c05df23d264864eb9cd5
author Daisuke Miyakawa <dmiyakawa@google.com> 1259916833 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259916833 -0800

am 8280c2b1: Implement new MockContentProvider. Also make ContentProvider aware of the class.

Merge commit '8280c2b15f6875b2d387c05df23d264864eb9cd5' into eclair-mr2-plus-aosp

* commit '8280c2b15f6875b2d387c05df23d264864eb9cd5':
  Implement new MockContentProvider. Also make ContentProvider aware of the class.