From: Raphael <raphael@google.com>
Date: Fri, 30 Oct 2009 02:31:07 +0000 (-0700)
Subject: am aad90b62: (-s ours) am 940073e2: (-s ours) Merge change I28aa1104 into eclair-sdk
X-Git-Tag: android-x86-2.2~248^2^2~42
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e175f329b721d03f39cfd59a31f9d395cd4afe39;p=android-x86%2Fsdk.git

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

Merge commit 'aad90b62c73e6d44ed391fb24953021d0b45a768' into eclair-mr2

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

e175f329b721d03f39cfd59a31f9d395cd4afe39