From: Jean-Baptiste Queru <jbq@google.com>
Date: Mon, 3 Aug 2009 14:45:46 +0000 (-0700)
Subject: merge from donut
X-Git-Tag: android-x86-2.2~385^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3146a1d112a5666c266eaaf138859b28bde2f666;p=android-x86%2Fpackages-apps-Camera.git

merge from donut
---

3146a1d112a5666c266eaaf138859b28bde2f666