From: The Android Automerger <android-build@android.com>
Date: Mon, 6 Feb 2012 15:03:00 +0000 (-0800)
Subject: merge in jb-release history after reset to master
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~1536^2~102^2^2^2^2^2^2^2^2^2^2^2^2^2~2^2^2^2^2^2^2^2^2^2~2^2^2^2^2^2^2^2^2^2^2^2^2~1^2~1^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=7c233472a1a91c525b9f71830921b5d217b4c251;p=android-x86%2Fpackages-apps-Camera2.git

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

7c233472a1a91c525b9f71830921b5d217b4c251