| commit | ae9c829777449e63c41268a6a6f4c53ff13357e4 | [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 | bbf2d925873e21f07e47bb0f802aa1376e70cb01 [diff] | |
| parent | acd574c1a7f3e8e79ab14aef942b896019349798 [diff] |
am acd574c1: am 7a67c335: Merge "Modify the code to avoid potential deadlocks." * commit 'acd574c1a7f3e8e79ab14aef942b896019349798': Modify the code to avoid potential deadlocks.