am 462e56eb: (-s ours) am 2a7b0b99: am b9c40a65: (-s ours) Merge change I5d30aa18 into eclair

Browse Source

Merge commit '462e56eb2752f9fe28d93debb70badd6a32e7d47'

* commit '462e56eb2752f9fe28d93debb70badd6a32e7d47':
  Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.

...

This commit is contained in:

Daisuke Miyakawa

2009-11-11 17:37:04 -08:00

committed by Android Git Automerger

parent 3527a5cfad 462e56eb27

commit a3a3815473

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