am 85a9498a: am 9c0b39c4: am ca00dee2: Merge change I5aa3adcf into eclair

Merge commit '85a9498a2f33d62a4313a3561b5468456974696e'

* commit '85a9498a2f33d62a4313a3561b5468456974696e':
  Improve the exception message text by including eglGetError().