Merge "fix small bug in EGL error management" into gingerbread