diff options
| author | Xavier Ducrohet <xav@android.com> | 2009-11-16 11:32:53 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-16 11:32:53 -0800 |
| commit | dbb811f695a92eb16a10dc02cae29e6197b871b3 (patch) | |
| tree | 2be5aacbe410439b4a1d5ce6fff5c769c2e6680c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 974718ceafb0b35bcab0b4a10f4365e7010c0a9b (diff) | |
| parent | 13f82e0909647c62187e0dc84a6560329f81b930 (diff) | |
am 19e420c5: Merge change Iae493184 into eclair
Merge commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d' into eclair-mr2
* commit '19e420c52dbe42e5b4b8b3580a5e7908cebec89d':
Minor fix for the parent style computation in the layoutlib.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions