tree df82d6b4b2afd6b4f080e8d737cb1c6e06bab805
parent e72bd5430236f2bfaeda3ddcce183286c713e295
parent 0b30ad53423a9bfab53b1632a33159be3d82e3df
author Jesse Hall <jessehall@google.com> 1367375894 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1367375894 -0700

am 0b30ad53: am 09f3cc2b: Merge "Fix GLES30 JNI registration" into jb-mr2-dev

* commit '0b30ad53423a9bfab53b1632a33159be3d82e3df':
  Fix GLES30 JNI registration