tree d279d4a506bee2b5aabf37c5432e23cfc309939a
parent 291744a651760261527f0bf66a7573d4a94a862e
parent ba5c1f674511aff458dae69927a1c61d60e66aa1
author Jesse Hall <jessehall@google.com> 1336712140 -0700
committer android code review <noreply-gerritcodereview@google.com> 1336712141 -0700

Merge "Remove init-time GLES per-frame callback"