| commit | 402e888ecbaa8c7fce4f686f72ab5a0a5aab1e6d | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Sat Jul 26 02:40:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 26 02:40:30 2014 +0000 |
| tree | 2de9ff9b22c5b7a07e345242b1a1735bc76f2531 | |
| parent | a8cc3074cd15a7fb284c7294046a204f82d2c47b [diff] | |
| parent | 61bf88f67630e07d63fc8297024e1a3e114cb755 [diff] |
am d2d80f2e: am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev * commit 'd2d80f2e401a06564cb03b649582f74c41e1337b': Fix a deadlock due to AMS calling into WMS with its lock held.