diff options
| author | Conley Owens <cco3@android.com> | 2011-07-18 12:44:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-18 12:44:57 -0700 |
| commit | 8c5dd0061d6c2ee2223b6aa83e1f4ad1b7cb1e3f (patch) | |
| tree | d3ab7b42eae95f1b0ea7b186adf4a1def484babf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4fa5dc52c04680db3b15b8fe741a2ee699ad933f (diff) | |
| parent | 4b1d4a7ac3e89351698b7528ea0f6292510f1091 (diff) | |
am 3edba93f: am 98fcc404: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '3edba93fd9bff8e2b22486271e6e816e3b233ae9':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions