diff options
| author | Romain Guy <romainguy@google.com> | 2010-04-06 12:43:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 12:43:16 -0700 |
| commit | b02ddf7b8a8651ec3af2695acb41eb6831dea63f (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5cca32c9a0076e5e04fd38f57e2502f6eee331ee (diff) | |
| parent | ad01b202a6e47d74c6e95eba443e7cefb5abc510 (diff) | |
am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions