diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-09-01 13:18:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-01 13:18:40 -0700 |
| commit | 25bb38f64c35f884ab9e96105a5cc5cbba8043ac (patch) | |
| tree | a5b01e7714e08c28da6d945bea0296d013cbaccf /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3192e184024e0087208dd4f71ff955bb93071736 (diff) | |
| parent | 260c04a4c5ab82e092e09559647c03a6fa6c53d2 (diff) | |
am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'
* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
Fix invalid comment in WebSettings.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions