diff options
| author | Danica Chang <danicachang@google.com> | 2010-07-19 13:50:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 13:50:49 -0700 |
| commit | fc17349f3853c10b8cd345549242bcb983e327f3 (patch) | |
| tree | 84f9ae1e55b173a9692d2868c7d1a956b7c47de9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 29bff32cc07a33d837a046770c6db2d401ef82b6 (diff) | |
| parent | 4978e7814f8bc37bc772ce96345723e4506a13be (diff) | |
am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp
* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
fixed parsing issue in BluetoothService so that it parses the UUID property correctly
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions