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

* commit '2045bb05ed40fe248e4c3beb3071d2dadd36103c':


Trivial merge