From: George Mount <mount@google.com>
Date: Mon, 5 Nov 2012 23:48:46 +0000 (-0800)
Subject: am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for... 
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~2^2~145
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79a50cad;p=android-x86%2Fpackages-apps-Camera2.git

am b2fb154f: am 3bfbae1d: am 24af89b9: Merge "Ensure photo sphere icon shows for panoramas." into gb-ub-photos-arches

* commit 'b2fb154fa84ec663bb8e181c299a3868e9ee98aa':
---

79a50cad0ae7c228fa6ae438136f8a8fcae0eddb