am 36ae696f: Limiting number of ContentProviderOperations per yield point.

Merge commit '36ae696fec100780667ed2770faeac7a031aef99' into eclair-mr2-plus-aosp

* commit '36ae696fec100780667ed2770faeac7a031aef99':
  Limiting number of ContentProviderOperations per yield point.