diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-05-18 11:17:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-18 11:17:01 -0700 |
| commit | 7e4881eceec2dd1abbc2cec3b9f6c746af8f1e14 (patch) | |
| tree | 6993687d0c39d4fe3303d40166c0ad7450e9e969 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b47eaa315d626e92ac58ff74efddd53e64b7451d (diff) | |
| parent | 7074d8febb8a3812fbcebceeb52aa7f5df454776 (diff) | |
am 5ccb8b8c: merge from open-source master
Merge commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3' into kraken
* commit '5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3':
Fix updating and deleting FDN entries with an empty alpha identifier.
Abort FDN delete when number is empty (instead of name)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions