diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-04 09:27:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-04 09:27:35 -0700 |
| commit | 61aee0c84573170c545c14fc152c6b09715a63ab (patch) | |
| tree | ed855078c90054b870b6effb1b1ea9f82f1fb200 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 439dcb36ed2ce1c485b2c13a5c1ca4b120e18924 (diff) | |
| parent | 00ad0d2d5cd69b8326679892194d7f6477fec427 (diff) | |
am 6de3a6fd: merge from open-source master
Merge commit '6de3a6fdd303b15ad944570daf37faa798dc1989' into kraken
* commit '6de3a6fdd303b15ad944570daf37faa798dc1989':
Fix typo of <p> end tag in appwidgets.xml
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions