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)
commit84e2e85c08f1a66de28fc74a23ef7baf9be920df
tree229488c533322ebfd0a84564698bf56987c8bb7f
parentd0d97b9d6192cdc039053deda9e395b9b87fb6c1
parent85a5f9325f24ed2b45eb7dad927e60cccd71a70d
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