tree 4a599e90bf5f64c6efd1745276ec4ba1710bf5fc
parent b436a328a5392b3ed33ca1186c85b71af61497d1
parent f454b52ee7d7bdd2fe207860921ca58eeed19017
author Jesse Hall <jessehall@google.com> 1366148339 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366148339 -0700

am f454b52e: am 811d3734: Merge "Add android.opengl.GLES30, hidden for now" into jb-mr2-dev

* commit 'f454b52ee7d7bdd2fe207860921ca58eeed19017':
  Add android.opengl.GLES30, hidden for now