From: The Android Open Source Project <initial-contribution@android.com>
Date: Fri, 11 Feb 2011 00:13:10 +0000 (-0800)
Subject: merge from tools_r10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=97854f32e16b8f145169e985154b778af1cb052b;p=android-x86%2Fsdk.git

merge from tools_r10

Change-Id: I605434d1a2bbad5369c73c127c6d87b4b0c59b8a
---

97854f32e16b8f145169e985154b778af1cb052b