From: Dan Stoza <stoza@google.com>
Date: Thu, 30 Apr 2015 19:55:49 +0000 (+0000)
Subject: am 11603b7b: am 08a7c792: Merge "Remove gamma correction from color correction shader"
X-Git-Tag: android-x86-7.1-r1~1095
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6ad985a81776c56505afaa250fea07c35bb6bc4d;p=android-x86%2Fframeworks-native.git

am 11603b7b: am 08a7c792: Merge "Remove gamma correction from color correction shader"

* commit '11603b7b87a52795975f7751898ee91ae1792fb3':
  Remove gamma correction from color correction shader
---

6ad985a81776c56505afaa250fea07c35bb6bc4d