From: The Android Automerger <android-build@android.com>
Date: Mon, 29 Mar 2010 16:25:17 +0000 (-0700)
Subject: Merge branch 'froyo' into froyo-release
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bb6cb381eafd4eb50b0366cfe65418e97d907c2f;p=android-x86%2Fpackages-apps-Browser.git

Merge branch 'froyo' into froyo-release
---

bb6cb381eafd4eb50b0366cfe65418e97d907c2f