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

merge from tools_r10

Change-Id: I8852a3ca28977057efff4aa50f31f99d5bf5b67c
---

bf55bd2d23beb6e49b932599dd9723e17e2e25dd