am d6af2e0c: Merge change I43a335c3 into eclair

Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-plus-aosp

* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
  Suppress takePicture test from continuous DO NOT MERGE.