From: Sascha Haeberling <haeberling@google.com>
Date: Mon, 7 Oct 2013 21:59:00 +0000 (-0700)
Subject: am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~1684^2~44^2~53
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d820c0c6;p=android-x86%2Fpackages-apps-Camera2.git

am 2a2f33fe: (-s ours) Fix missing filtershow string. DO NOT MERGE

* commit '2a2f33feffe61e2e7b5717aa05de718856f5bec0':
  Fix missing filtershow string. DO NOT MERGE
---

d820c0c6c28656e99db3adfd2f79a91ba7674553