From: Kevin Gabayan Date: Wed, 25 Sep 2013 00:25:55 +0000 (+0000) Subject: Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aa... X-Git-Tag: android-x86-6.0-r3~1684^2~148 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e0bf566d;p=android-x86%2Fpackages-apps-Camera2.git Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad --- e0bf566d4ab2c45e05635397bdfd6c9f9a92a356