OSDN Git Service

am 79c8d6bc: am 04df8565: am 1fd97693: Merge change Ia13e890e into eclair
authorDavid 'Digit' Turner <digit@google.com>
Fri, 11 Dec 2009 07:41:16 +0000 (23:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 07:41:16 +0000 (23:41 -0800)
commit0ce0e46ce287f70cf5561b5642faba481679a9e7
treece4430844b2a89c3443a9149b761a4a5ba074d01
parent5f6f3de0ad1d092a1102938c517b2760192403a1
parentcbfda686c5ff3d892fc99b5ea29ba6b6951f3627
am 79c8d6bc: am 04df8565: am 1fd97693: Merge change Ia13e890e into eclair

Merge commit '79c8d6bc0678b86b6dd41eb4d854bddc315fa244'

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