am 4b8e35b9: Merge "Make TEXTURE_3D the only target requiring ASTC HDR" into mnc...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:39:43 +0000 (19:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:39:43 +0000 (19:39 +0000)
am: 1a9f30c8fe

* commit '1a9f30c8fe97cfed431ef9186e07dd92e838c224':


Trivial merge