commit | aa168f04c99ed11932b14b0ab98ea121e5ca2252 | [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 | be3ea01ef859b8b24e0e37e65000ce6b341cd3c6 | |
parent | 32d5984d31a01697c5b785dd5e50c86f616316eb [diff] | |
parent | 3a2dc0d573bcfdebc1464ee9316767c2fca91a55 [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.