From: Ed Heyl <ed@google.com>
Date: Tue, 25 Oct 2011 19:50:40 +0000 (+0000)
Subject: Merge remote branch 'goog/ics-mr0' into ics-mr1
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~1767^2~66
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2015a3c3;p=android-x86%2Fpackages-apps-Camera2.git

Merge remote branch 'goog/ics-mr0' into ics-mr1
---

2015a3c36930045d6268871e9c6907533d863702