From: Xavier Ducrohet <xav@android.com>
Date: Thu, 29 Sep 2011 18:42:10 +0000 (-0700)
Subject: am 2bd58150: (-s ours) Merge 440fea from master. do not merge.
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=792193deab3db1efd196566cfedd477337ca679c;p=android-x86%2Fsdk.git

am 2bd58150: (-s ours) Merge 440fea from  do not merge.

* commit '2bd58150cdac3603552241fe70a73388e7094670':
  Merge 440fea from master. do not merge.
---

792193deab3db1efd196566cfedd477337ca679c