am 57d31464: resolved conflicts for merge of 2045bb05 to master
authorKalle Raita <kraita@google.com>
Mon, 1 Jun 2015 15:35:01 +0000 (15:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:35:01 +0000 (15:35 +0000)
* commit '57d314640d93897394f7c9616773498d4bc94e82':
  Make TEXTURE_3D the only target requiring ASTC HDR


Trivial merge