From: The Android Automerger <android-build@android.com>
Date: Mon, 19 Mar 2012 14:05:07 +0000 (-0700)
Subject: merge in jb-release history after reset to master
X-Git-Tag: android-x86-6.0-r3~2042^2~598^2~48^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=627b9ef62c1ec53a037421f2b3013c422785aa44;p=android-x86%2Fpackages-apps-Camera2.git

merge in jb-release history after reset to master
---

627b9ef62c1ec53a037421f2b3013c422785aa44