am dc137591: Merge "Fix -Wconversion warnings in framework/egl."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 01:01:05 +0000 (01:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 01:01:05 +0000 (01:01 +0000)
* commit 'dc13759130ebb045e851a29ea3ba643e152a7b5c':
  Fix -Wconversion warnings in framework/egl.


Trivial merge