am 6d52c15d: am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 1 Jun 2015 17:34:05 +0000 (17:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 17:34:05 +0000 (17:34 +0000)
commit3350477113b5d1764b2b54049b09e8b78e5da112
treefe5d5318e1b5e49458ff8b0ae98db6876dd0504d
parente07447a38e9546e3a4a15ce66c7df6e1c68dfa92
parent6d52c15d4b4243778f8fe46514eb4693f507963a
am 6d52c15d: am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev

* commit '6d52c15d4b4243778f8fe46514eb4693f507963a':
  Allow alternative mix() implementation
modules/glshared/glsBuiltinPrecisionTests.cpp