From: Bill Yi Date: Tue, 29 Apr 2014 18:34:24 +0000 (-0700) Subject: Merge commit 'f9525d410de0b840f0da5a8659734f91a66f8ed2' into HEAD X-Git-Tag: android-x86-6.0-r3~68^2~27^2~45^2~2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ece4866d;p=android-x86%2Fpackages-apps-Camera2.git Merge commit 'f9525d410de0b840f0da5a8659734f91a66f8ed2' into HEAD --- ece4866dc575b956801f6dab2d6c4923e272c5fa