diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2010-09-15 18:02:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 18:02:59 -0700 |
| commit | a89c3d03d87d6a99626a3a71f01639d0b9977cac (patch) | |
| tree | 14932a87458bbc9f1488a977ea1a1a31539b22af /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3ae681ba2d45fc2c50b1ed1f15dc3e7c3390e26f (diff) | |
| parent | bcd2ed6d3251d0c72334bb56cac1693e2dc54d03 (diff) | |
am 134b28a7: Merge "Update Inet Connection Status display" into gingerbread
Merge commit '134b28a7f049719cb74fd5baadbbcc5915bc861b' into gingerbread-plus-aosp
* commit '134b28a7f049719cb74fd5baadbbcc5915bc861b':
Update Inet Connection Status display
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions