OSDN Git Service

am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair
authorBrett Chabot <brettchabot@android.com>
Tue, 3 Nov 2009 01:20:30 +0000 (17:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Nov 2009 01:20:30 +0000 (17:20 -0800)
commitf13b7c7f7ce4b1bd14af0280ef51db375eb65fd8
tree32f61dbcc934e895467cf589b496963b2d7ad2b6
parent64e648fdd93c9642bdbda3e44082e50f4baeb0c1
parent4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7
am 4aa7e0aa: am d6af2e0c: (-s ours) Merge change I43a335c3 into eclair

Merge commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7' into eclair-mr2-plus-aosp

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