diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-06-01 15:46:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-01 15:46:53 -0700 |
| commit | f1ad0d9c74b6adc4831de3898513fc66c07bd560 (patch) | |
| tree | ce2620bfcd981e0b9a023ba424f4dfb00c53ec4a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5220f483382d314b38e24a4520080eae63005eb7 (diff) | |
| parent | 7c7eadeb4f72878bbbb76e3353767985ed024033 (diff) | |
am 8799cdfb: am de56c27d: Merge "Doc change: rename slide decks for sorting by year then quarter." into froyo
Merge commit '8799cdfb012935501e47f15f28d6a8ed90bd464d' into kraken
* commit '8799cdfb012935501e47f15f28d6a8ed90bd464d':
Doc change: rename slide decks for sorting by year then quarter.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions