am 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where...
am 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock
* commit '2cad801d':
[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock