am 0024f551: Revert "Refactor ShaderLibrary"
authorPyry Haulos <phaulos@google.com>
Wed, 2 Sep 2015 17:58:58 +0000 (17:58 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 17:58:58 +0000 (17:58 +0000)
* commit '0024f5512d4e3796b42bb2afe5449e3adac6a137':
  Revert "Refactor ShaderLibrary"


Trivial merge