| commit | 6dcf42149b183e2a2a062c90d60a2803cf01523a | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Mon Nov 16 13:06:54 2009 -0800 |
| committer | Raphael <raphael@google.com> | Mon Nov 16 13:07:43 2009 -0800 |
| tree | 8b7874b87251a533eb66c2d50afa3e7dacba4358 | |
| parent | a0ac4b1492ae742e2f12138b647ea9781054a1b0 [diff] | |
| parent | 0da4f158f98430c58eb362446b7c67fe78451d78 [diff] |
resolved conflicts for merge of 0da4f158 to eclair Fixes a merge eclair-sdk => eclair conflict of SDK Manager: phase 1 of support for future schemas SDK BUG 2252825 Change-Id: I7530bdb7315439416abad114ef59208f8d4b3ab8