diff options
| author | Conley Owens <cco3@android.com> | 2011-07-18 16:53:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 16:53:41 -0700 |
| commit | 60f8195edcf75969041bcbebdf5ed54ea76f9ec2 (patch) | |
| tree | d3ab7b42eae95f1b0ea7b186adf4a1def484babf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4161a0125eafb7e608422d8d754f3194523d796b (diff) | |
| parent | 61d3cf3bfa5dd17bd036ef6a536f40aa5467e923 (diff) | |
am a74774fd: am 4d8f6a38: Merge "stagefright aacenc: Mark codeWord as UWord16"
* commit 'a74774fd9146aa22801487d3652dc18e9e328b8e':
stagefright aacenc: Mark codeWord as UWord16
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions