diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-04-06 14:14:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 14:14:21 -0700 |
| commit | d327d0d213461d73b146f706da87c0639795ebbc (patch) | |
| tree | cdbf9768a271b0e0c930e042bbf7359082ffb896 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c92f523d3ae9d2db8ee54fcd166a417173378569 (diff) | |
| parent | d8172858f3e75c5f85fc808600eaa6735aa92602 (diff) | |
am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions