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

* commit '4b5785ddd92ec7c76e3bfb513e168f59d1c8c9c1':


Trivial merge