diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-01-24 08:43:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-24 08:43:14 -0800 |
| commit | 10c4641c2e2f747f8fef7d217d550b7f9a6de588 (patch) | |
| tree | ff0ae2bcb02cc90b9dec564a6b3f350cb6e42daa /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9f080e2a5bc6a268934e32201c69ea8a86900396 (diff) | |
| parent | 2ae5805cf18ad6bdbea5def03a488e14c1a8804c (diff) | |
am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions