commit | 91279c6e434b8b1f385104c375301a8f44e51e83 | [log] [tgz] |
---|---|---|
author | Daisuke Miyakawa <dmiyakawa@google.com> | Wed Nov 11 17:26:30 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 11 17:26:30 2009 -0800 |
tree | a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17 | |
parent | 2b27f5be7411e7fdb95acfc3ebea5c127be56bfc [diff] | |
parent | f63f2403889b321afce7ab0682e536f3a6da0307 [diff] |
am 2a7b0b99: am b9c40a65: (-s ours) Merge change I5d30aa18 into eclair Merge commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e' into eclair-mr2-plus-aosp * commit '2a7b0b996fba30cb57062559773e8855c8cf1b9e': Make vCard parser invalid lines in vCard file which look like some comment. Do not merge.