| commit | 5a28bc2368f0db69c4581a69ab1f394f742f6f01 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Jun 01 22:02:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 22:02:27 2015 +0000 |
| tree | 79ba278b966ed3e2879fe158bb09844fc52cab5a | |
| parent | 6d2d105bb8610cddd2c330c945e8875bdb5ab806 [diff] | |
| parent | 855b721738f3185f64d482d6d37cccb6e78b080c [diff] |
am acd574c1: am 7a67c335: Merge "Modify the code to avoid potential deadlocks." * commit 'acd574c1a7f3e8e79ab14aef942b896019349798': Modify the code to avoid potential deadlocks.