| commit | 61bf88f67630e07d63fc8297024e1a3e114cb755 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Sat Jul 26 02:36:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 26 02:36:39 2014 +0000 |
| tree | 0acede440c10658a72f37d60c88b449373ef09ff | |
| parent | 16efefce5c1c1db8659d1ff416115400222363b4 [diff] | |
| parent | f0f0f7ca66e15c5cebfbcf38a8d1e576b3e6e335 [diff] |
am 8944771f: Merge "Fix a deadlock due to AMS calling into WMS with its lock held." into lmp-dev * commit '8944771f51cd39867594a26b31d1ade5c5117e75': Fix a deadlock due to AMS calling into WMS with its lock held.