Merge "Clean up SPIR-V support code in framework" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 14 Mar 2016 19:15:54 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 14 Mar 2016 19:15:54 +0000 (19:15 +0000)
am: b9bd2f2251

* commit 'b9bd2f22512ad5842765299a38c60a39bff64c62':
  Clean up SPIR-V support code in framework


Trivial merge