OSDN Git Service

am 54284eb6: resolved conflicts for merge of 5a7d8f2d to stage-aosp-master
authorDavid 'Digit' Turner <digit@google.com>
Fri, 31 Oct 2014 16:33:42 +0000 (16:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Oct 2014 16:33:42 +0000 (16:33 +0000)
commit47f730ae679740596b3b39003f9958dfbea67e93
tree22c90148f4459a0925f4a3fa5c631929f7825afd
parentfa9752f6e063b05bf3a9e22efadcb53b9a9ff10f
parent23cda3522dc93c8e683325954fcf107c51645873
am 54284eb6: resolved conflicts for merge of 5a7d8f2d to stage-aosp-master

* commit '54284eb63c164d924f39f15086e55c65d8e6833f':
  opengl: Regenerate GPU emulation encoder sources.
  opengl: Remove compiler warnings.
  opengl: Remove accessor functions from encoders.
  opengl: Fix a few function name typos.