Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a61ef5 authored by Patrick Scott's avatar Patrick Scott Committed by Android Git Automerger
Browse files

am 5b7ea014: (-s ours) am e7b2845d: Merge "DO NOT MERGE return an error when... 

am 5b7ea014: (-s ours) 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 '5b7ea0146dcfd5564d894d4cf0104919775feb36'

* commit '5b7ea0146dcfd5564d894d4cf0104919775feb36':
  DO NOT MERGE
parents d77667f3 696f0ade

There are no changes