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 | 143c3d32f455b7ad5fc12a5415cef9336c1d377b (patch) | |
| tree | 0a5e3c2440a4e6f326486e40697a477ab3119c64 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 400907086ac1a304daa50a72013ac27a9c63b26b (diff) | |
| parent | 5ccb8b8c4d6eabcc984559ef9e71efdbb3de00d3 (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