OSDN Git Service

resolved conflicts for merge of 0da4f158 to eclair
authorRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:06:54 +0000 (13:06 -0800)
committerRaphael <raphael@google.com>
Mon, 16 Nov 2009 21:07:43 +0000 (13:07 -0800)
commit6dcf42149b183e2a2a062c90d60a2803cf01523a
tree8b7874b87251a533eb66c2d50afa3e7dacba4358
parenta0ac4b1492ae742e2f12138b647ea9781054a1b0
parent0da4f158f98430c58eb362446b7c67fe78451d78
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