tree 127cf5c32b45986f271d68864beb53e9286c3226
parent 422bd3ec25cab70b0de2dcc95ab545a13b318ce9
parent 8e24428214a50901cc1a43f785e6d824661bf210
author Dmitri Plotnikov <dplotnikov@google.com> 1254430669 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254430669 -0700

am 8e244282: am 0f511622: Making contacts provider tests run again

Merge commit '8e24428214a50901cc1a43f785e6d824661bf210'

* commit '8e24428214a50901cc1a43f785e6d824661bf210':
  Making contacts provider tests run again