diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-01 19:03:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 19:03:42 -0700 |
| commit | e8d5136fec62caeab0dcd583c47099339e58c887 (patch) | |
| tree | e6d5067ea5511b294bbe82388abfef5bbd1833c1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 715c224997b3ac7875a5f809b61699f06b0921d5 (diff) | |
| parent | e8914cec61ba38c7e2c534ebaf7e3d47daa40a57 (diff) | |
am e951ef07: Merge "Wait for initial device scan to finish before updating config." into gingerbread
Merge commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125' into gingerbread-plus-aosp
* commit 'e951ef07dd8cb36ec0e127e80f5d558b8a2d6125':
Wait for initial device scan to finish before updating config.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions