diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-10-17 22:02:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-17 22:02:32 -0700 |
| commit | fdf997785ecf77415ef7fd6b34c724f12a7cf062 (patch) | |
| tree | 60e01d1b54244b5da6a07286d5794b6fb7346442 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b2be3e65e700158acd7f9070fcde2fa9b61aee07 (diff) | |
| parent | dc100dac1b3f7c5098c05dc0e763503936bcdcc7 (diff) | |
am cf054d1c: (-s ours) am f8834f87: Merge "fetch macaddr right after supplicant connection" into gingerbread
Merge commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39'
* commit 'cf054d1cf605d46d3b2e459c28fe4516df104a39':
fetch macaddr right after supplicant connection
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions