am fb193241: Refactor ShaderLibrary (with Android.mk fix)
authorPyry Haulos <phaulos@google.com>
Wed, 2 Sep 2015 19:34:58 +0000 (19:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Sep 2015 19:34:58 +0000 (19:34 +0000)
* commit 'fb19324168dd35ccbb7fca74e5426f1a3fbc03a2':
  Refactor ShaderLibrary (with Android.mk fix)


Trivial merge