OSDN Git Service

am e28083d7: am 9e7edffa: Merge "opengl: Fix pixelDataSize() ambiguity."
authorDavid 'Digit' Turner <digit@google.com>
Fri, 28 Nov 2014 10:20:43 +0000 (10:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Nov 2014 10:20:43 +0000 (10:20 +0000)
commit94c1610b73be2d7a87ca1a751ac5f6d0ecd29ee0
tree4b8a8981f074a93b5c92b25955cfdf48978bff98
parent327482820f7c04c5d315d5bf199f475999a43bfe
parent83b656944c39a54fc03f1b0e9b676c192e415a05
am e28083d7: am 9e7edffa: Merge "opengl: Fix pixelDataSize() ambiguity."

* commit 'e28083d7f28dda0a5f2c7484334c24d73475b456':
  opengl: Fix pixelDataSize() ambiguity.