From: The Android Automerger <android-build@android.com>
Date: Wed, 7 Nov 2012 21:06:04 +0000 (-0800)
Subject: merge in jb-mr1-release history after reset to jb-mr1-dev
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~13^2~80^2~1^2~37^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7cf5542b9dcbc72fe4a235a129908bc6ea87b698;p=android-x86%2Fpackages-apps-Camera2.git

merge in jb-mr1-release history after reset to jb-mr1-dev
---

7cf5542b9dcbc72fe4a235a129908bc6ea87b698