diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-01 18:52:27 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-01 18:52:27 -0800 |
| commit | ab399bb2852b0c67df9e3e1c2a5fcd55e09f59bf (patch) | |
| tree | c908dc021a1ae92fc6402bf7d21813c1938411cd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5e9277b46129d962525bc2fa68b22124d487fbb0 (diff) | |
| parent | d9f8d1650d855f60c24020dc06ecd4c8ec6e2141 (diff) | |
am 48e07296: am bfb3dec2: Merge "More social integration." into ics-mr1
* commit '48e07296800c49f8bc9b34cc57372593021f79a1':
More social integration.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions