am 677e4644: Fix couple of issues in refactored ShaderLibrary
authorPyry Haulos <phaulos@google.com>
Wed, 30 Sep 2015 20:06:45 +0000 (20:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 20:06:45 +0000 (20:06 +0000)
* commit '677e4644b77c36b99a8959561730c9a519cc37c0':
  Fix couple of issues in refactored ShaderLibrary


Trivial merge