am d5be8ad6: Assume border color is always in linear space.
authorJarkko Pöyry <jpoyry@google.com>
Fri, 1 May 2015 19:24:27 +0000 (19:24 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 1 May 2015 19:24:27 +0000 (19:24 +0000)
* commit 'd5be8ad612a000b4ad2caf14c8d93501f3558eb8':
  Assume border color is always in linear space.

1  2 
framework/common/tcuTexture.cpp

Simple merge