From: Jesse Hall <jessehall@google.com>
Date: Wed, 1 May 2013 02:32:39 +0000 (-0700)
Subject: am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev
X-Git-Tag: android-x86-4.4-r1~115^2~33
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=34c0fb183767b80e93a7cd77233ead5fe50bd822;p=android-x86%2Fframeworks-native.git

am cc8f8ad3: Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev

* commit 'cc8f8ad33d4f8f55ff30e1600cc59c7cf5113c8a':
  Fix glGetUniformIndices JNI prototype
---

34c0fb183767b80e93a7cd77233ead5fe50bd822