am f13b7c7f: (-s ours) am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair

Merge commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8'

* commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8':
  Suppress takePicture test from continuous DO NOT MERGE.
This commit is contained in:
Brett Chabot
2009-11-02 17:46:21 -08:00
committed by Android Git Automerger

Diff Content Not Available