From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 8 Nov 2012 16:58:02 +0000 (-0800)
Subject: am d7545049: 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~39
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=286e9cd80827518e75de282fd88f1352656a7a6d;p=android-x86%2Fpackages-apps-Camera2.git

am d7545049: Reconcile with jb-mr1-release - do not merge

* commit 'd7545049bfe7142389eae84394d6b76ed9b68fb2':
---

286e9cd80827518e75de282fd88f1352656a7a6d