diff options
| author | Marc Blank <mblank@google.com> | 2010-04-29 16:28:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-29 16:28:50 -0700 |
| commit | f472da17d6c18b5e40459467e3d4dfa5da07a7b1 (patch) | |
| tree | 6e045c6385b287921035999ac263221abfcc62f9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 69cb780bed8ae2ccc08ad166d775cea923bc44d5 (diff) | |
| parent | 83a1c18b9218372b6ec13464e7802503f8153abf (diff) | |
am 9ca81664: am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '9ca816649bd2af7d540f375be8fcc503c50aef72' into kraken
* commit '9ca816649bd2af7d540f375be8fcc503c50aef72':
Expose _id in ExtendedProperties subValues
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions