From: Jean-Baptiste Queru <jbq@google.com>
Date: Thu, 9 Jun 2011 22:01:26 +0000 (-0700)
Subject: Reconcile with honeycomb-mr2-release
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ad8fe0c12b593fec209feefa337905653299ac06;p=android-x86%2Fpackages-apps-Trebuchet.git

Reconcile with honeycomb-mr2-release

Change-Id: If41c7ab9f88ffdf56d5e7b5cbf16bfe3381f6b88
---

ad8fe0c12b593fec209feefa337905653299ac06