Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp * commit '9d5fac517463526450268bf6353e32c13a8cdd0c': fix small bug in EGL error management
Merge commit '9d5fac517463526450268bf6353e32c13a8cdd0c' into gingerbread-plus-aosp * commit '9d5fac517463526450268bf6353e32c13a8cdd0c': fix small bug in EGL error management