From: Bobby Georgescu <georgescu@google.com>
Date: Mon, 5 Nov 2012 23:42:52 +0000 (-0800)
Subject: am 625bca8d: am 5fd5a8be: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip... 
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~195
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce48e21c9a822a73998a9ae424f4303eea002b1c;p=android-x86%2Fpackages-apps-Camera2.git

am 625bca8d: am 5fd5a8be: am 856ec7e5: am 79704855: Merge "Do not show "Filmstrip view" text when photo is fullscreen" into gb-ub-photos-arches

* commit '625bca8d66db8bf5cfeb87598fc14cafbd2bba4e':
---

ce48e21c9a822a73998a9ae424f4303eea002b1c