tree 8b7874b87251a533eb66c2d50afa3e7dacba4358
parent a0ac4b1492ae742e2f12138b647ea9781054a1b0
parent 0da4f158f98430c58eb362446b7c67fe78451d78
author Raphael <raphael@google.com> 1258405614 -0800
committer Raphael <raphael@google.com> 1258405663 -0800

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