From: nicolasroard <nicolasroard@google.com>
Date: Fri, 18 Oct 2013 00:36:40 +0000 (-0700)
Subject: am 8f8baa62: am bbc64781: am cdd7d873: am 4bbcb6da: Merge "Fix wrong applied fx"... 
X-Git-Tag: android-x86-7.1-r1~206
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=75ff046bd19b9b94d2ecb1f4c6e47129afedf715;p=android-x86%2Fpackages-apps-Gallery2.git

am 8f8baa62: am bbc64781: am cdd7d873: am 4bbcb6da: Merge "Fix wrong applied fx" into gb-ub-photos-carlsbad

* commit '8f8baa6291dda2e388e0d02f5a628e7fce3410ec':
  Fix wrong applied fx
---

75ff046bd19b9b94d2ecb1f4c6e47129afedf715