tree 50181664462c55422c5d5773a0ed9ef9dd549ae2
parent 5d46b04bd5a8ec00ea527b68aa48907d3978a007
parent 46fc9cb60cdbd44f4f42966d37babc8a1bc1263d
author Jesse Hall <jessehall@google.com> 1367375447 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1367375448 +0000

Merge "Fix glGetUniformIndices JNI prototype" into jb-mr2-dev