From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 19 Dec 2012 16:37:24 +0000 (-0800)
Subject: Reconcile with jb-mr1.1-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~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e86fd1570b943e02d8435b2ce27a1806b72ee2c;p=android-x86%2Fpackages-apps-Camera2.git

Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3381ba02649abcb559115d5bf1e508ca1f361a66
---

5e86fd1570b943e02d8435b2ce27a1806b72ee2c