commit | faa91f852e9526b2f112122da9ae0956526cf662 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Tue Feb 11 16:40:39 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Feb 11 16:40:39 2014 +0000 |
tree | 39535e468bacaef05410d512d0794c41d27f8181 | |
parent | b1ed19a2ed1739c0d415cc81a3b7c458307694ab [diff] | |
parent | 86fb9904ad5760cb957782b45e96054c01fe4200 [diff] |
am 86fb9904: am 8a63c34b: am 3aeb629d: Merge "Use long to store pointers in GLES_JNI/EGL classes" * commit '86fb9904ad5760cb957782b45e96054c01fe4200': Use long to store pointers in GLES_JNI/EGL classes