diff options
| author | Danica Chang <danicachang@google.com> | 2010-07-19 13:52:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-19 13:52:38 -0700 |
| commit | 6953ae1fb4969f968393dd955f536e9dbe670270 (patch) | |
| tree | 6c5e8d329134a56c5ff40a87a3ecf1325a0720b0 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d68bce695c6415b76a430b58d46ee2c9462187e9 (diff) | |
| parent | fc17349f3853c10b8cd345549242bcb983e327f3 (diff) | |
am cbbd3a1b: am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread
Merge commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed'
* commit 'cbbd3a1b950ef14075159319ac0fd0a8a19bb9ed':
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