am 04df8565: am 1fd97693: Merge change Ia13e890e into eclair

Merge commit '04df8565bf8f2b81a632fcd736cb96c8da478b9e' into eclair-mr2-plus-aosp

* commit '04df8565bf8f2b81a632fcd736cb96c8da478b9e':
  Update documentation to indicate EGL ES 2.0 isn't supported in the emulator.