am e17256b4: Merge "Fix -Wconversion warnings in glshared."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 01:20:37 +0000 (01:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 01:20:37 +0000 (01:20 +0000)
* commit 'e17256b47b6e7844d05136cb8c1c5b1d730f7d9d':
  Fix -Wconversion warnings in glshared.


Trivial merge