am 5219a82f: am 8ecfb60a: Merge "Fix a bug that prevented the creation of EGL shared contexts." into gingerbread

Merge commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d'

* commit '5219a82f9d64a7d13401dcf9a0703a0ca2cd842d':
  Fix a bug that prevented the creation of EGL shared contexts.