From: The Android Open Source Project Date: Thu, 8 Nov 2012 22:22:22 +0000 (-0800) Subject: am b7a115c7: Reconcile with jb-mr1-release - do not merge 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~2^2~37 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a51d6a2;p=android-x86%2Fpackages-apps-Camera2.git am b7a115c7: Reconcile with jb-mr1-release - do not merge * commit 'b7a115c77ad4852aae5ec2ce30ea2b05f3dd1d75': --- 5a51d6a23d7e2ab7fabcc88e71cd59454b692d09