diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-09-09 16:05:43 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-09 16:05:43 -0700 |
| commit | e35258f379727fc8a4a182fdd1d3887f4331fef2 (patch) | |
| tree | 363cfe186972ea21da789fe8c7d457d56df79969 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d4225c0e578fe8a660207a520a093400f1517467 (diff) | |
| parent | e3138edec616309bbc6d2060cdf29df81a0a89b8 (diff) | |
am 166aeb29: Merge "DO NOT MERGE: Remove Device Bluez-Dbus interface watch." into gingerbread
Merge commit '166aeb290be234531ba049b6702f558a02317393' into gingerbread-plus-aosp
* commit '166aeb290be234531ba049b6702f558a02317393':
DO NOT MERGE: Remove Device Bluez-Dbus interface watch.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions