diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-04-01 10:40:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-01 10:40:15 -0700 |
| commit | 6025796ec2094411ca80f944eeb8ae62e2f2b881 (patch) | |
| tree | 7a13d65bca39938309b90f95dfb57f45aedfe844 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5627f6093ab0cb93c57ca0130bca3e3ce8478cc8 (diff) | |
| parent | 805fc9d373eee514bc70ca52fb66dd51909b2f39 (diff) | |
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 '2d8234b73d11fdc2178232cabad3ffaa23723405' into froyo-plus-aosp
* commit '2d8234b73d11fdc2178232cabad3ffaa23723405':
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