am 4b8e35b9: Merge "Make TEXTURE_3D the only target requiring ASTC HDR" into mnc-dev
authorKalle Raita <kraita@google.com>
Mon, 1 Jun 2015 14:31:03 +0000 (14:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 14:31:03 +0000 (14:31 +0000)
* commit '4b8e35b9947de8f50d6b32116376832cc95d7d79':
  Make TEXTURE_3D the only target requiring ASTC HDR


Trivial merge