| commit | 996bdbaaf0b532c77c10a1efea3b17eb50f416db | [log] [tgz] |
|---|---|---|
| author | Jerry J. Wang <jerryw@google.com> | Thu Jun 23 14:29:55 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 23 14:29:55 2011 -0700 |
| tree | a908b03c6d3216f127d973d5e82f26a34d2acbe8 | |
| parent | 16d1f17675c02282226936e11f4a9cb646eeeaa1 [diff] | |
| parent | 4333de2a8e878b319c0e779942b87c042804d352 [diff] |
am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2 * commit '4333de2a8e878b319c0e779942b87c042804d352': Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)