From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 8 Nov 2012 14:27:05 +0000 (-0800)
Subject: am 486ac238: am 5636617c: 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~49
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5e08513d06c0a71796efbc2910ebadf0caec8177;p=android-x86%2Fpackages-apps-Camera2.git

am 486ac238: am 5636617c: Reconcile with jb-mr1-release - do not merge

* commit '486ac23882dcca5998a8914f3f80e2597537ffd9':
---

5e08513d06c0a71796efbc2910ebadf0caec8177