am 55025acb: Merge "Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky. http://b/2557727" into froyo

Merge commit '55025acb6e492a8c260a45525f62b808f9280ecc' into froyo-plus-aosp

* commit '55025acb6e492a8c260a45525f62b808f9280ecc':
  Fix issue#2557727 android.provider.cts.MediaStore_Images_MediaTest#testInsertImageWithImagePath is flaky.
tree: 85d036b6703f27c87c7dfd496e6749057bce47d1
  1. tests/
  2. tools/
  3. .gitignore
  4. Android.mk
  5. CleanSpec.mk