From: nicolasroard <nicolasroard@google.com>
Date: Wed, 13 Feb 2013 00:09:31 +0000 (+0000)
Subject: Merge "Turn back on the state panel" into gb-ub-photos-bryce
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~201^2~353
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4d25bee70415aabd3fa8439a75d02e14323e187d;p=android-x86%2Fpackages-apps-Camera2.git

Merge "Turn back on the state panel" into gb-ub-photos-bryce
---

4d25bee70415aabd3fa8439a75d02e14323e187d