From: The Android Open Source Project <initial-contribution@android.com>
Date: Thu, 23 May 2013 15:10:21 +0000 (-0700)
Subject: am edf16ad6: (-s ours) Reconcile with jb-mr2-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~52
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5b140a67ac134446911f53b2ac1edd742677d37f;p=android-x86%2Fpackages-apps-Camera2.git

am edf16ad6: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'edf16ad654cbebd53ef7be0c585e0f1937340f06':
---

5b140a67ac134446911f53b2ac1edd742677d37f