am 2b4b61a4: Merge "Fix -Wconversion warnings in EGL module."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 00:34:46 +0000 (00:34 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 00:34:46 +0000 (00:34 +0000)
* commit '2b4b61a426430e9c0a5eeb757f6db7fca8a95c6a':
  Fix -Wconversion warnings in EGL module.


Trivial merge