Merge "Clean up SPIR-V support code in framework" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 14 Mar 2016 19:10:31 +0000 (19:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 14 Mar 2016 19:10:31 +0000 (19:10 +0000)

Trivial merge