Merge "DO NOT MERGE: Add cube gather tests that avoid corners; remove D32F from...
authorDaniel Xie <dxie@google.com>
Mon, 11 Jan 2016 19:52:13 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:52:13 +0000 (19:52 +0000)
am: 7f454ca9ca  -s ours

* commit '7f454ca9cac4c05289d1567087d97e50f99001c1':


Trivial merge