diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-08-09 19:53:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-09 19:53:57 -0700 |
| commit | d37a8fa969a3ddd14fbc64272d68e725ecfc9369 (patch) | |
| tree | 509b165a9c92abd77498666313483d9216648e5b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7e3eed4db3dedbc136e2c72df82bd847a739d5cf (diff) | |
| parent | b5a3d0a1503a85dc9a9f5ce3a966deaa7da4d8e8 (diff) | |
am 745d1e90: Merge "Update javadoc for the API and change return of getBondedDevices()." into gingerbread
Merge commit '745d1e905886ed0d8fa0a8590463093d125bc53a' into gingerbread-plus-aosp
* commit '745d1e905886ed0d8fa0a8590463093d125bc53a':
Update javadoc for the API and change return of getBondedDevices().
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions