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

Browse Source

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

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

...

This commit is contained in:

Brett Chabot

2009-11-02 17:20:30 -08:00

committed by Android Git Automerger

parent 64e648fdd9 4aa7e0aae1

commit f13b7c7f7c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available