| commit | f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8 | [log] [tgz] |
|---|---|---|
| author | Brett Chabot <brettchabot@android.com> | Mon Nov 02 17:20:30 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 02 17:20:30 2009 -0800 |
| tree | 32f61dbcc934e895467cf589b496963b2d7ad2b6 | |
| parent | 64e648fdd93c9642bdbda3e44082e50f4baeb0c1 [diff] | |
| parent | 4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7 [diff] |
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.