diff options
author | Scott Main <smain@google.com> | 2011-06-22 17:53:12 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-22 17:53:12 -0700 |
commit | 1a54e9271bff1a567ca83a1ade5907ab27b38b58 (patch) | |
tree | cc677d7f751d9900458c481845dead6e9404d065 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | bec296ff25144025ad03a00cf3e560440d27e974 (diff) | |
parent | 68e715e2585e118fe76cc5335865bbd7e1f11024 (diff) |
am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2
* commit '138836adc7e28e66984fdc20d22688d4da561c15':
docs: add info about manifest attributes that should not change
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions