From: The Android Automerger Date: Tue, 5 Nov 2013 14:04:15 +0000 (-0800) Subject: merge in klp-mr1-release history after reset to klp-dev X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~23^2~19^2^2~6^2~1^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25d90f4fd453f2ca9783d8429adf147354efb772;p=android-x86%2Fpackages-apps-Camera2.git merge in klp-mr1-release history after reset to klp-dev --- 25d90f4fd453f2ca9783d8429adf147354efb772