diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-27 13:09:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-27 13:09:40 -0800 |
| commit | 18643e705a50f6c1c865e56e75d8403422a76d65 (patch) | |
| tree | 9def7c3655cd0af426a08be3f39726a54a6c9fe8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c76ca242ce2bd26c97c78ddf6842429850f541d9 (diff) | |
| parent | 6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d (diff) | |
am 6bc542e0: am 5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '6bc542e0f31bcb7ce5ff466c7aa4676f6aa91f7d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions