| commit | 58d4a86639efcc3c53d539b1254845e2bd8c33bc | [log] [tgz] |
|---|---|---|
| author | Mathias Agopian <mathias@google.com> | Fri May 17 13:55:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 17 13:55:28 2013 -0700 |
| tree | 7c6e6419798e96aa804d1aff3affd62b3a6e2d28 | |
| parent | 2381033ad001960c606d13e3a4198e5da3672ec7 [diff] | |
| parent | 2cad801d0d05190cf4ab7edc7ecffc5862ee18dd [diff] |
am 2cad801d: (-s ours) am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock * commit '2cad801d0d05190cf4ab7edc7ecffc5862ee18dd': [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock