am a7438f76: Fix bug in handling CRLF line endings in ShaderLibrary
authorPyry Haulos <phaulos@google.com>
Mon, 8 Dec 2014 19:17:46 +0000 (19:17 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 8 Dec 2014 19:17:46 +0000 (19:17 +0000)
* commit 'a7438f761960032e1150e6e1b30990062136bc15':
  Fix bug in handling CRLF line endings in ShaderLibrary


Trivial merge