From: The Android Open Source Project <initial-contribution@android.com>
Date: Sun, 16 Jan 2011 22:26:05 +0000 (-0800)
Subject: merge from tools_r9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c3a9198ef3e08505942bf3f5e727577498342265;p=android-x86%2Fsdk.git

merge from tools_r9

Change-Id: I51577e76c8c679f0c5f631411c71ea062acf22f6
---

c3a9198ef3e08505942bf3f5e727577498342265