| commit | 17335a0f1b3c35d57aaf5454bd3708505908d420 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jun 01 22:09:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 22:09:40 2015 +0000 |
| tree | a926b86dd66bbf24153e770dc26d4eecb5ee7efc | |
| parent | 87da629fb3c871b85c05b981d83064d3bcde758a [diff] | |
| parent | ae9c829777449e63c41268a6a6f4c53ff13357e4 [diff] |
am ae9c8297: am acd574c1: am 7a67c335: Merge "Modify the code to avoid potential deadlocks." * commit 'ae9c829777449e63c41268a6a6f4c53ff13357e4': Modify the code to avoid potential deadlocks.