| commit | 696f0adeef370c9bae63d6ae2d6bfb937225bdcd | [log] [tgz] |
|---|---|---|
| author | Patrick Scott <phanna@android.com> | Tue Jan 26 10:11:30 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 26 10:11:30 2010 -0800 |
| tree | 020803d23d451d1e01e7516ee2e3201a307039a2 | |
| parent | e42072d30cbe08651ececce06751f6a8936273b4 [diff] | |
| parent | 30b2c96928a599a08713ad4911849848a1c79c8a [diff] |
am e7b2845d: Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2 Merge commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4' into eclair-mr2-plus-aosp * commit 'e7b2845d685a583e8e84de369b6acfa1bebeabf4': DO NOT MERGE