From: The Android Automerger <android-build@android.com>
Date: Wed, 3 Apr 2013 13:02:48 +0000 (-0700)
Subject: merge in jb-mr2-release history after reset to jb-mr2-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~272^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7dca39d8b25676c6400c75a70d6ac8a498441270;p=android-x86%2Fpackages-apps-Camera2.git

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

7dca39d8b25676c6400c75a70d6ac8a498441270