From: Raphael <raphael@google.com>
Date: Thu, 29 Oct 2009 20:30:46 +0000 (-0700)
Subject: am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
X-Git-Tag: android-x86-2.2~98^2~39^2~114
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2b267ebe6d01acf4a516c9618203c845f5cf0f61;p=android-x86%2Fsdk.git

am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk

Merge commit '940073e267695a7c4a404cb2174b48e893c15a45' into eclair

* commit '940073e267695a7c4a404cb2174b48e893c15a45':
  SDK Updater: don't load sdk-repo XML that failed to validate. DO NOT MERGE.
---

2b267ebe6d01acf4a516c9618203c845f5cf0f61