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 | bfd978355695e1a3a2887716f3d8fe028daa6005 (patch) | |
| tree | c83421e2fe5c59f10d4b36fbdcfd856feeed6ba6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 147b601e99981e339df0be74a3dcda9f27fe73a0 (diff) | |
| parent | 67f1ceb616ced4ce9857ee24f43d3c9dd5b289a5 (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