From: The Android Automerger Date: Mon, 14 Oct 2013 13:00:32 +0000 (-0700) Subject: merge in klp-release history after reset to klp-dev X-Git-Tag: android-x86-6.0-r3~68^2~27^2~45^2~13^2^2^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=180f009b254c887c225bb1754b40b7d0bde75076;p=android-x86%2Fpackages-apps-Camera2.git merge in klp-release history after reset to klp-dev --- 180f009b254c887c225bb1754b40b7d0bde75076