| commit | 15e4155a951bc2daa0a60c41ee2b5195bca9f5df | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Wed Dec 01 03:37:00 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 01 03:37:00 2010 -0800 |
| tree | 7a00f9de9aad3f6305a663b94d63960ec7dc6dd0 | |
| parent | c75872920cd2de02d04bdc132ad5cf6d78c0578f [diff] | |
| parent | 2d6dbfb5e3f16d800d2e0b5da283001e53e72768 [diff] |
am 3a2dc0d5: (-s ours) am b690e55d: Merge "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client." into gingerbread * commit '3a2dc0d573bcfdebc1464ee9316767c2fca91a55': DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.