diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-10 12:55:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 12:55:30 -0700 |
| commit | 41cc056619b25b1fc8e01ef36634b4b50b1f3823 (patch) | |
| tree | 11ab336c37c0f62ee9e73d210f7a267cc140687f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 60c2a78c47bc821a5f32a1fab7cab5d2247ab166 (diff) | |
| parent | 98a880a34cfa77efa30d3b86e0c24f1c48d27a9b (diff) | |
am f5cae7d1: (-s ours) am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
Merge commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56'
* commit 'f5cae7d1c516ad233d7ec833c23c046e2501ec56':
DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions