diff options
| author | Matthew Xie <mattx@google.com> | 2011-11-08 07:00:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-08 07:00:33 +0000 |
| commit | 367ee7f34528591aa6be6ec7fb9ad2f0c459b240 (patch) | |
| tree | 6191b555f84848c224a8aaca7664edba7eb10ded /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0462805d1c3b16d294a21d8ee253666ec010f543 (diff) | |
| parent | f8119b9d4a6c5fd5eeecd0d72239a444f5cbba1f (diff) | |
am 67f1ceb6: Merge "Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp" into ics-mr1
* commit '67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5':
Make public APIs of ACTION_UUID, getUuids, and fetchUuidsWithSdp
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions