From: John Hoford <hoford@google.com>
Date: Mon, 5 Nov 2012 23:52:38 +0000 (-0800)
Subject: am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white... 
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~140
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5534e7b90aa3d5c397aabbdbe9c4e400fd06680d;p=android-x86%2Fpackages-apps-Camera2.git

am 56311a81: am ea4097c9: am 4b2c4ecb: am 67fefdb9: add support for black and white filters, add rotation API to tiny planet

* commit '56311a81651dd90b47440f8db58cb78652b38f22':
---

5534e7b90aa3d5c397aabbdbe9c4e400fd06680d