diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-05-21 21:35:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-21 21:35:38 -0700 |
| commit | 4a74b0f4780324ead8e567e8cd97a250afe4ef28 (patch) | |
| tree | dc6b00566431771934a0e1084a316317338b994e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c5fb0536deb269ad09004d2e9ae0a2695bed3e84 (diff) | |
| parent | 70b1bea6e1a389e15604ec2c78d2d374aeb0b945 (diff) | |
am 5a6bec53: resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
* commit '5a6bec53e224b2db9ecbc6920faab08f4a962256':
Simplfy getActive* calls in ConnectivityService
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions