From: Sascha Haeberling Date: Wed, 30 Apr 2014 18:14:49 +0000 (+0000) Subject: am 4e587d83: (-s ours) am 78d2c5a3: am 85beb3cb: am d8b555b8: Merge "Updating shutter... X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~116 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6acca3f0ee7d12b26d86b7dbb65b446d3328c3b5;p=android-x86%2Fpackages-apps-Camera2.git am 4e587d83: (-s ours) am 78d2c5a3: am 85beb3cb: am d8b555b8: Merge "Updating shutter button resources" into gb-ub-photos-carlsbad * commit '4e587d834902918d1d417687d5b691573b21144e': --- 6acca3f0ee7d12b26d86b7dbb65b446d3328c3b5