am 45011f2d: (-s ours) Merge change I4e9fe62b into eclair

Browse Source

Merge commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80' into eclair-mr2

* commit '45011f2dc56e99c00bd1f3abff4f11d6df644d80':
  do not merge -- original checkin to mr2 here:

...

This commit is contained in:

Cary Clark

2009-11-06 11:29:40 -08:00

committed by Android Git Automerger

parent f28e0c2ac7 45011f2dc5

commit ca3a6dc414

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