OSDN Git Service

am 1fd97693: Merge change Ia13e890e into eclair
authorDavid 'Digit' Turner <digit@google.com>
Fri, 11 Dec 2009 01:40:07 +0000 (17:40 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 01:40:07 +0000 (17:40 -0800)
commit04df8565bf8f2b81a632fcd736cb96c8da478b9e
treece43b64274e852856351f710c5ee9b5fd2914e98
parent036832adba9d953f8d34ece1bd5b049f02437928
parent1fd97693dc03fac4e189e5361a7ac7ee033caff2
am 1fd97693: Merge change Ia13e890e into eclair

Merge commit '1fd97693dc03fac4e189e5361a7ac7ee033caff2' into eclair-mr2

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