OSDN Git Service

am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
authorBrett Chabot <brettchabot@android.com>
Tue, 3 Nov 2009 01:15:02 +0000 (17:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Nov 2009 01:15:02 +0000 (17:15 -0800)
commit4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7
tree74c6f1d02006f8d2a4be3f4e04d96490b38652cd
parentb580d53e7517e6020ee42c4f0fcda21bf381c74e
parentd6af2e0cbf144b091d9c9d1bf2f3061547220c80
am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair

Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2

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