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:58 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:52:58 +0000 (19:52 +0000)
am: d04254f29f  -s ours

* commit 'd04254f29f449e642323302a9bb793a3b15cb8c8':


Trivial merge