From: Alan Newberger Date: Fri, 30 Aug 2013 21:22:55 +0000 (+0000) Subject: Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad X-Git-Tag: android-x86-6.0-r3~1684^2~231 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2581af9b;p=android-x86%2Fpackages-apps-Camera2.git Merge "add up button support for filmstrip" into gb-ub-photos-carlsbad --- 2581af9b08ac913465303795745c3ce24eb0f20c