tree e0ef33920837849c3c9f96b5502b7098b3408f94
parent 71345e18ebc2f1ecfc944c062ff0d319db3fcde3
parent c09530b7a1f2f59f7bae0f9a14214db4b955feb6
author Dmitri Plotnikov <dplotnikov@google.com> 1258140716 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258140716 -0800

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

Merge commit 'c09530b7a1f2f59f7bae0f9a14214db4b955feb6'

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