diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-12-02 17:57:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-02 17:57:37 -0800 |
| commit | af2eab228536ddc34e14dbada26040cdb1de26ea (patch) | |
| tree | c13657903573c911c2ad799dc4fbcfdb1bad6565 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a68b5e9d410ece63449dd5b5ab6dd80fb2e3018e (diff) | |
| parent | b3e9629420561df38ccbee2806fccb8dd0569a0a (diff) | |
am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1
* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
Be careful sharing connections when dun is in play
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions