diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-10-07 16:58:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-07 16:58:13 -0700 |
| commit | 98a880a34cfa77efa30d3b86e0c24f1c48d27a9b (patch) | |
| tree | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5f8dbb502f22e7e8f5e88e0abd27d76c0fe10b4a (diff) | |
| parent | 36150e99a4b52bfed606c9b87404c36996d36e14 (diff) | |
am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
Merge commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914' into gingerbread-plus-aosp
* commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914':
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