diff options
| author | Daniel Lehmann <lehmannd@google.com> | 2010-04-06 14:17:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-06 14:17:57 -0700 |
| commit | a6fe972d81d4bd0b2afe78791043a99b8aad22ad (patch) | |
| tree | ec1cb255bbdad108ce60ceb7267e305a4f0f34e6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f4ac9129129cdc5dffc33aa47bf73e9b908f44b7 (diff) | |
| parent | d327d0d213461d73b146f706da87c0639795ebbc (diff) | |
am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
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