Skip to content
Commit e7b2845d authored by Patrick Scott's avatar Patrick Scott Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE return an error when Surface::lock() is called while the... 

Merge "DO NOT MERGE return an error when Surface::lock() is called while the surface is already locked." into eclair-mr2
parents caf0ce3c 3348f5ae
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment