am 05eca1d4: (-s ours) Merge change Ie80e2381 into eclair

Browse Source

Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-mr2

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:

...

This commit is contained in:

Andreas Huber

2009-11-05 13:59:20 -08:00

committed by Android Git Automerger

parent 7b2aa74f46 05eca1d46a

commit e334ce27f1

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