am 4663bec5: Merge "Use transfer format for uploaded data in texture tests"
authorMika Isojärvi <misojarvi@google.com>
Fri, 12 Jun 2015 22:16:04 +0000 (22:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Jun 2015 22:16:04 +0000 (22:16 +0000)
* commit '4663bec50fccc2f2239d8fce53cd00128e8ab4c1':
  Use transfer format for uploaded data in texture tests


Trivial merge