diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-12 14:41:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 14:41:40 -0700 |
| commit | 09cb2f693246b53b747dd0b066c98a95a44feb92 (patch) | |
| tree | 12283462dbf86ce6f21d9a4d5e7757639be0e371 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6ddb6ff99e745719b64bdb8f99fbd35db99f90f1 (diff) | |
| parent | 327e55780fe63ff1ad08c08839646c2085730033 (diff) | |
am ccfd99b1: merge from open-source master
Merge commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614' into kraken
* commit 'ccfd99b1e2a64c72ec433ebf5cf98d644ab24614':
Support for User to User Signaling (UUS)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions