diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-04-01 10:47:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 10:47:00 -0700 |
| commit | 2e5074f6454cc5a0d097633d325dc2de8d783fc8 (patch) | |
| tree | a02db8ec4f9529c70a90e48822c7a21f2ac18b25 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b2215d40b4ef31754b70a0707ef46e54d5f09bdd (diff) | |
| parent | 6025796ec2094411ca80f944eeb8ae62e2f2b881 (diff) | |
am 865bd884: am 2d8234b7: Merge "doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
Merge commit '865bd884e878bbc6d9f5832fda6971c21754b588' into kraken
* commit '865bd884e878bbc6d9f5832fda6971c21754b588':
doc change: cherry pick 75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions