From: The Android Automerger <android-build@android.com>
Date: Tue, 11 Oct 2011 12:34:06 +0000 (-0700)
Subject: merge in ics-release history after reset to master
X-Git-Tag: android-x86-6.0-r3~2042^2~791^2^2^2^2^2^2^2^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=375ed96be141405c325ca826101883e45bf4c781;p=android-x86%2Fpackages-apps-Camera2.git

merge in ics-release history after reset to master
---

375ed96be141405c325ca826101883e45bf4c781